Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src

1 files changed, 427 insertions, 422 deletions

diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 00b62d14c9fa..7f7298821f11 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -132,7 +132,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, false);
 
     return 0;
 }
@@ -154,17 +154,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 false;
     }
     if ( !pDoc->IsAdjustHeightEnabled() )
     {
-        return FALSE;
+        return false;
     }
 
     SCTAB nTab      = rRange.aStart.Tab();
@@ -174,8 +174,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, false );
 
     if ( bPaint && bChanged )
         rDocShell.PostPaint( 0, nStartRow, nTab, MAXCOL, MAXROW, nTab,
@@ -187,13 +187,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();
@@ -201,7 +201,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();
@@ -225,14 +225,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 false;
 
     ScDocShellModificator aModificator( rDocShell );
 
@@ -242,7 +242,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();
@@ -266,14 +266,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();
@@ -281,7 +281,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();
@@ -305,14 +305,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 false;
 
     ScDocShellModificator aModificator( rDocShell );
 
@@ -322,7 +322,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();
@@ -346,14 +346,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();
@@ -361,7 +361,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();
@@ -385,14 +385,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();
@@ -400,8 +400,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();
@@ -427,20 +427,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 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();
@@ -469,12 +469,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 = false;
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDetOpList* pList = pDoc->GetDetOpList();
     if ( pList && pList->Count() )
     {
@@ -491,8 +491,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)
@@ -537,7 +537,7 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
             }
         }
         rDocShell.SetDrawModified();
-        bDone = TRUE;
+        bDone = sal_True;
     }
     return bDone;
 }
@@ -583,38 +583,38 @@ void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<S
 
 //------------------------------------------------------------------------
 
-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() )
     {
         OSL_FAIL("ScDocFunc::DeleteContents ohne Markierung");
-        return FALSE;
+        return false;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScEditableTester aTester( pDoc, rMark );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return false;
     }
 
     ScRange aMarkRange;
-    BOOL bSimple = FALSE;
+    sal_Bool bSimple = false;
 
     ScMarkData aMultiMark = rMark;
-    aMultiMark.SetMarking(FALSE);       // fuer MarkToMulti
+    aMultiMark.SetMarking(false);       // fuer MarkToMulti
 
     ScDocument* pUndoDoc = NULL;
-    BOOL bMulti = !bSimple && aMultiMark.IsMultiMarked();
+    sal_Bool bMulti = !bSimple && aMultiMark.IsMultiMarked();
     if (!bSimple)
     {
         aMultiMark.MarkToMulti();
@@ -623,22 +623,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 = false;
     }
 
     // keine Objekte auf geschuetzten Tabellen
-    BOOL bObjects = FALSE;
+    sal_Bool bObjects = 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 = 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 );
 
@@ -669,7 +669,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
@@ -704,31 +704,31 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
 
     aModificator.SetDocumentModified();
 
-    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 = false;
 
     ScEditableTester aTester( pDoc, rMark );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return false;
     }
 
     ScRange aMarkRange;
     ScMarkData aMultiMark = rMark;
-    aMultiMark.SetMarking(FALSE);       // for MarkToMulti
+    aMultiMark.SetMarking(false);       // for MarkToMulti
     aMultiMark.MarkToMulti();
     aMultiMark.GetMultiMarkArea( aMarkRange );
 
@@ -746,7 +746,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 ) );
@@ -759,31 +759,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 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];
@@ -791,18 +791,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,false,&pItem) )
         {
-            pHasFormat[0] = TRUE;
+            pHasFormat[0] = sal_True;
             pOldFormats[0] = ((const SfxUInt32Item*)pItem)->GetValue();
         }
         else
-            pHasFormat[0] = FALSE;
+            pHasFormat[0] = false;
     }
 
     pDoc->SetString( rPos.Col(), rPos.Row(), rPos.Tab(), rText );
@@ -824,15 +824,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)
@@ -843,14 +843,14 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi
             if (!bApi)
                 rDocShell.ErrorMessage(aTester.GetMessageId());
             pNewCell->Delete();
-            return FALSE;
+            return 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;
@@ -878,16 +878,16 @@ 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 */ )
+void ScDocFunc::NotifyInputHandler( const ScAddress& rPos )
 {
     ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
     if ( pViewSh && pViewSh->GetViewData()->GetDocShell() == &rDocShell )
     {
         ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
-        if ( pInputHdl )
+        if ( pInputHdl && pInputHdl->GetCursorPos() == rPos )
         {
             sal_Bool bIsEditMode(pInputHdl->IsEditMode());
 
@@ -895,30 +895,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(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 = 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
@@ -928,7 +928,7 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
 
         sal_Bool bUpdateMode(rEngine.GetUpdateMode());
         if (bUpdateMode)
-            rEngine.SetUpdateMode(sal_False);
+            rEngine.SetUpdateMode(false);
 
         ScMyRememberItemList aRememberItems;
         ScMyRememberItem* pRememberItem = NULL;
@@ -937,8 +937,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() )
@@ -995,9 +995,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 );
         }
     }
 
@@ -1016,7 +1016,7 @@ ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const Stri
 
 
 ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
-        const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
+        const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar, short* pRetFormatType )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     ScBaseCell* pNewCell = NULL;
@@ -1050,7 +1050,12 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
         sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
         double fVal;
         if ( pFormatter->IsNumberFormat( rText, nEnglish, fVal ) )
+        {
             pNewCell = new ScValueCell( fVal );
+            // return the format type from the English format, so a localized format can be created
+            if ( pRetFormatType )
+                *pRetFormatType = pFormatter->GetType( nEnglish );
+        }
         else if ( rText.Len() )
             pNewCell = ScBaseCell::CreateTextCell( rText, pDoc );
 
@@ -1062,8 +1067,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
@@ -1111,7 +1116,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(), false);
 
     rDocShell.SetDocumentModified();
 
@@ -1120,7 +1125,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 );
 
@@ -1142,7 +1147,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(), false);
 
     rDocShell.PostPaintCell( rPos );
     aModificator.SetDocumentModified();
@@ -1152,7 +1157,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;
 
@@ -1162,7 +1167,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 );
@@ -1199,7 +1204,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(), false);
 
         aModificator.SetDocumentModified();
         bDone = true;
@@ -1214,23 +1219,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 = 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 false;
     }
 
     ScDocShellModificator aModificator( rDocShell );
@@ -1238,7 +1243,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
@@ -1259,7 +1264,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 );
@@ -1273,38 +1278,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 = 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 false;
     }
 
     ScStyleSheet* pStyleSheet = (ScStyleSheet*) pDoc->GetStyleSheetPool()->Find(
                                                 rStyleName, SFX_STYLE_FAMILY_PARA );
     if (!pStyleSheet)
-        return FALSE;
+        return false;
 
     ScDocShellModificator aModificator( rDocShell );
 
     ScRange aMultiRange;
-    BOOL bMulti = rMark.IsMultiMarked();
+    sal_Bool bMulti = rMark.IsMultiMarked();
     if ( bMulti )
         rMark.GetMultiMarkArea( aMultiRange );
     else
@@ -1333,7 +1338,7 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
 
     pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark );
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     if (!AdjustRowHeight( aMultiRange ))
         rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
     else if (nExtFlags & SC_PF_LINES)
@@ -1341,13 +1346,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 );
 
@@ -1361,7 +1366,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) )
     {
         OSL_FAIL("invalid row in InsertCells");
-        return FALSE;
+        return false;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -1370,8 +1375,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
@@ -1384,7 +1389,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     }
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -1399,7 +1404,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;
                 }
             }
@@ -1411,7 +1416,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();
@@ -1451,7 +1456,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( eCmd == INS_CELLSRIGHT )
         nMergeTestEndX = MAXCOL;
 
-    BOOL bNeedRefresh = FALSE;
+    sal_Bool bNeedRefresh = false;
 
     SCCOL nEditTestEndX = (eCmd==INS_INSCOLS) ? MAXCOL : nMergeTestEndX;
     SCROW nEditTestEndY = (eCmd==INS_INSROWS) ? MAXROW : nMergeTestEndY;
@@ -1460,7 +1465,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return false;
     }
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );      // wichtig wegen TrackFormulas bei UpdateReference
@@ -1470,7 +1475,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, false, false );
 
         // pRefUndoDoc is filled in InsertCol / InsertRow
 
@@ -1481,7 +1486,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 = false;
     std::vector<ScRange> qIncreaseRange;
     String aUndo = ScGlobal::GetRscString( STR_UNDO_INSERTCELLS );
     if (bRecord)
@@ -1494,7 +1499,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;
@@ -1510,7 +1515,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return false;
                 }
 
                 SCCOL nTestCol = -1;
@@ -1526,12 +1531,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 )
                         {
@@ -1539,12 +1544,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;
                                 }
                             }
                         }
@@ -1555,7 +1560,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             {
                                 qIncreaseRange.push_back( aRange );
                             }
-                            bInsertMerge = TRUE;
+                            bInsertMerge = sal_True;
                         }
                     }
                 }
@@ -1598,7 +1603,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 );
                             }
                         }
                     }
@@ -1608,7 +1613,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return false;
                 }
             }
         }
@@ -1640,7 +1645,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
             break;
         default:
             OSL_FAIL("Falscher Code beim Einfuegen");
-            bSuccess = FALSE;
+            bSuccess = false;
             break;
     }
 
@@ -1703,7 +1708,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     aRange.aStart.Col(), aRange.aStart.Row(),
                     aRange.aEnd.Col(), aRange.aEnd.Row() );
                 aMergeOption.maTabs.insert(aRange.aStart.Tab());
-                MergeCells(aMergeOption, FALSE, TRUE, TRUE);
+                MergeCells(aMergeOption, false, true, true);
             }
             qIncreaseRange.pop_back();
         }
@@ -1716,14 +1721,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;
@@ -1731,7 +1736,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)
                 {
@@ -1754,20 +1759,19 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                  ScCellMergeOption aMergeOption(
                     aRange.aStart.Col(), aRange.aStart.Row(),
                     aRange.aEnd.Col(), aRange.aEnd.Row() );
-                MergeCells(aMergeOption, FALSE, TRUE, TRUE);
+                MergeCells(aMergeOption, false, true, true);
                 qIncreaseRange.pop_back();
             }
 
             if( pViewSh )
             {
-                pViewSh->MarkRange( rRange, FALSE );
+                pViewSh->MarkRange( rRange, false );
                 pViewSh->SetCursor( nCursorCol, nCursorRow );
             }
         }
 
         rDocShell.GetUndoManager()->LeaveListAction();
-        SfxUndoManager* pMgr = rDocShell.GetUndoManager();
-        pMgr->RemoveLastUndoAction();
+        rDocShell.GetUndoManager()->RemoveLastUndoAction();
 
         delete pRefUndoDoc;
         delete pUndoData;
@@ -1781,8 +1785,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 );
 
@@ -1796,7 +1800,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) )
     {
         OSL_FAIL("invalid row in DeleteCells");
-        return FALSE;
+        return false;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -1805,11 +1809,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 = false;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -1824,7 +1828,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;
                 }
             }
@@ -1836,7 +1840,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();
@@ -1881,7 +1885,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return false;
     }
 
                     // Test zusammengefasste
@@ -1890,12 +1894,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 = 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 = false;
     String aUndo = ScGlobal::GetRscString( STR_UNDO_DELETECELLS );
     if (bRecord)
         rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
@@ -1919,7 +1923,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_DELETECELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return false;
                 }
 
                 nExtendStartCol = nMergeStartX;
@@ -1937,12 +1941,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 )
                         {
@@ -1950,12 +1954,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;
                                 }
                             }
                         }
@@ -1966,7 +1970,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             {
                                 qDecreaseRange.push_back( aRange );
                             }
-                            bDeletingMerge = TRUE;
+                            bDeletingMerge = sal_True;
                         }
                     }
                 }
@@ -1978,7 +1982,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 )
                         {
@@ -1998,7 +2002,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                         if( eCmd == DEL_CELLSLEFT )
                         {
                             nEndRow = aExtendMergeRange.aEnd.Row();
-                            bNeedRefresh = TRUE;
+                            bNeedRefresh = sal_True;
                         }
                         else
                         {
@@ -2014,7 +2018,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 );
                             }
                         }
                     }
@@ -2024,7 +2028,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_DELETECELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return false;
                 }
             }
         }
@@ -2056,26 +2060,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, false, pUndoDoc );
             }
         }
 
         pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-        pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, FALSE, FALSE );
+        pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, false, 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 = false;
     switch (eCmd)
     {
         case DEL_CELLSUP:
@@ -2114,10 +2118,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, false, 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,false,pUndoDoc,NULL,false);
         delete pRefUndoDoc;
 
         SCTAB* pTabs      = new SCTAB[nSelCount];
@@ -2193,7 +2197,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
         if( !pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
         {
             ScCellMergeOption aMergeOption(aRange);
-            MergeCells( aMergeOption, FALSE, TRUE, TRUE );
+            MergeCells( aMergeOption, false, true, true );
         }
         qDecreaseRange.pop_back();
     }
@@ -2225,7 +2229,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 );
             }
         }
     }
@@ -2261,11 +2265,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 );
 
@@ -2282,21 +2286,21 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) || !ValidRow(nDestRow) )
     {
         OSL_FAIL("invalid row in MoveBlock");
-        return FALSE;
+        return false;
     }
 
     //  zugehoerige Szenarien auch anpassen - nur wenn innerhalb einer Tabelle verschoben wird!
-    BOOL bScenariosAdded = FALSE;
+    sal_Bool bScenariosAdded = false;
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = 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;
@@ -2307,7 +2311,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;
@@ -2325,13 +2329,13 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
 
     SCCOL nOldEndCol = nEndCol;
     SCROW nOldEndRow = nEndRow;
-    BOOL bClipOver = FALSE;
+    sal_Bool bClipOver = 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;
     }
@@ -2342,14 +2346,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, false );
         SCROW nUndoAdd = nUndoEndRow - nDestEndRow;
         nDestEndRow = nDestRow + nClipY;
         nUndoEndRow = nDestEndRow + nUndoAdd;
@@ -2360,7 +2364,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         if (!bApi)
             rDocShell.ErrorMessage(STR_PASTE_FULL);
         delete pClipDoc;
-        return FALSE;
+        return false;
     }
 
     //  Test auf Zellschutz
@@ -2377,7 +2381,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
         delete pClipDoc;
-        return FALSE;
+        return false;
     }
 
     //  Test auf zusammengefasste - beim Verschieben erst nach dem Loeschen
@@ -2389,14 +2393,14 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
             if (!bApi)
                 rDocShell.ErrorMessage(STR_MSSG_MOVEBLOCKTO_0);
             delete pClipDoc;
-            return FALSE;
+            return 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 );
 
     //
@@ -2408,9 +2412,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 );
@@ -2418,30 +2422,30 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         if (bCut)
         {
             pDoc->CopyToDocument( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
-                                    nUndoFlags, FALSE, pUndoDoc );
+                                    nUndoFlags, false, pUndoDoc );
             pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, FALSE, FALSE );
+            pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, false, false );
         }
 
         if ( nDestTab != nStartTab )
             pUndoDoc->AddUndoTab( nDestTab, nDestEndTab, bWholeCols, bWholeRows );
         pDoc->CopyToDocument( nDestCol, nDestRow, nDestTab,
                                     nDestEndCol, nDestEndRow, nDestEndTab,
-                                    nUndoFlags, FALSE, pUndoDoc );
+                                    nUndoFlags, false, pUndoDoc );
 
         pUndoData = new ScRefUndoData( pDoc );
 
         pDoc->BeginDrawUndo();
     }
 
-    BOOL bSourceHeight = FALSE;     // Hoehen angepasst?
+    sal_Bool bSourceHeight = 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 );
 
@@ -2457,7 +2461,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
@@ -2468,17 +2472,17 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
                 delete pRefUndoDoc;
                 delete pUndoData;
                 delete pClipDoc;
-                return FALSE;
+                return false;
             }
 
-        bSourceHeight = AdjustRowHeight( rSource, FALSE );
+        bSourceHeight = AdjustRowHeight( rSource, 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
@@ -2487,16 +2491,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, false, bIncludeFiltered );
 
     // skipped rows and merged cells don't mix
     if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-        UnmergeCells( aPasteDest, FALSE, TRUE );
+        UnmergeCells( aPasteDest, false, sal_True );
 
     VirtualDevice aVirtDev;
-    BOOL bDestHeight = AdjustRowHeight(
+    sal_Bool bDestHeight = AdjustRowHeight(
                             ScRange( 0,nDestRow,nDestTab, MAXCOL,nDestEndRow,nDestEndTab ),
-                            FALSE );
+                            false );
 
     /*  Paste cell notes and drawing objects after adjusting formula references
         and row heights. There are no cell notes or drawing objects, if the
@@ -2507,19 +2511,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, 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, false, 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, false, pUndoDoc, NULL, false );
             delete pRefUndoDoc;
         }
 
@@ -2537,7 +2541,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;
     }
@@ -2554,7 +2558,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?
         {
@@ -2616,7 +2620,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;
 }
 
 //------------------------------------------------------------------------
@@ -2644,7 +2648,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!" );
@@ -2688,12 +2691,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!" );
 
@@ -2715,13 +2716,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 = false;
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
     ScDocShellModificator aModificator( rDocShell );
@@ -2731,20 +2731,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 = 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
 
@@ -2766,7 +2766,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);
@@ -2774,20 +2774,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 = 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 = false;
     if ( bVbaEnabled )
-        bRecord = FALSE;
-    BOOL bWasLinked = pDoc->IsLinked(nTab);
+        bRecord = false;
+    sal_Bool bWasLinked = pDoc->IsLinked(nTab);
     ScDocument* pUndoDoc = NULL;
     ScRefUndoData* pUndoData = NULL;
     if (bRecord)
@@ -2795,13 +2795,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,false, pUndoDoc );
         String aOldName;
         pDoc->GetName( nTab, aOldName );
-        pUndoDoc->RenameTab( nTab, aOldName, FALSE );
+        pUndoDoc->RenameTab( nTab, aOldName, false );
         if (bWasLinked)
             pUndoDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), pDoc->GetLinkDoc(nTab),
                                 pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab),
@@ -2810,13 +2810,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 ) );
@@ -2830,7 +2830,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)
@@ -2866,7 +2866,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
     {
@@ -2876,18 +2876,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 false;
     }
 
     ScDocShellModificator aModificator( rDocShell );
@@ -2896,7 +2896,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))
@@ -2906,7 +2906,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
         {
             if (!bApi)
                 rDocShell.ErrorMessage(STR_PROTECTIONERR);  //! eigene Meldung?
-            return FALSE;
+            return false;
         }
     }
 
@@ -2922,15 +2922,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?)
 
@@ -2953,24 +2953,24 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
         pBindings->Invalidate( SID_ATTR_SIZE );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-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 = false;
     if ( !pDoc->IsDocEditable() )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);
-        return FALSE;
+        return false;
     }
 
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = false;
     String sOldName;
     pDoc->GetName(nTab, sOldName);
     if (pDoc->RenameTab( nTab, rName ))
@@ -2984,7 +2984,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;
 }
@@ -3040,7 +3040,7 @@ bool ScDocFunc::SetTabBgColor(
         return false;
     }
 
-    USHORT nTab;
+    sal_uInt16 nTab;
     Color aNewTabBgColor;
     bool bSuccess = true;
     size_t nTabProtectCount = 0;
@@ -3094,9 +3094,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
@@ -3111,30 +3111,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 = false;
 
     // import into read-only document is possible
     if ( !pDoc->IsChangeReadOnlyEnabled() && !rDocShell.IsEditable() )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);      //! eigene Meldung?
-        return FALSE;
+        return false;
     }
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = false;
     SCCOLROW nStart = pRanges[0];
     SCCOLROW nEnd = pRanges[2*nRangeCnt-1];
 
-    BOOL bFormula = FALSE;
+    sal_Bool bFormula = false;
     if ( eMode == SC_SIZE_OPTIMAL )
     {
         //! Option "Formeln anzeigen" - woher nehmen?
@@ -3151,13 +3153,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, false );
+            pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, 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, false, sal_True );
+            pDoc->CopyToDocument( 0, static_cast<SCROW>(nStart), nTab, MAXCOL, static_cast<SCROW>(nEnd), nTab, IDF_NONE, false, pUndoDoc );
         }
 
         pUndoRanges = new SCCOLROW[ 2*nRangeCnt ];
@@ -3168,8 +3170,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 = false;
 
     pDoc->InitializeNoteCaptions(nTab);
     for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
@@ -3181,14 +3183,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, NULL, &nLastRow);
                         if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
@@ -3202,9 +3204,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 )
@@ -3212,14 +3214,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
@@ -3228,7 +3230,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
             {
                 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 +
@@ -3275,26 +3277,27 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
     pDoc->UpdatePageBreaks( nTab );
 
     rDocShell.PostPaint(0,0,nTab,MAXCOL,MAXROW,nTab,PAINT_ALL);
+    aModificator.SetDocumentModified();
 
     return bSuccess;
 }
 
 
-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 = 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 false;                   // erste Spalte / Zeile
 
     ScBreakType nBreak = bColumn ?
         pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) :
@@ -3304,7 +3307,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);
@@ -3315,7 +3318,7 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
     pDoc->UpdatePageBreaks( nTab );
 
     if (pDoc->IsStreamValid(nTab))
-        pDoc->SetStreamValid(nTab, FALSE);
+        pDoc->SetStreamValid(nTab, false);
 
     if (bColumn)
     {
@@ -3341,17 +3344,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 = false;
     SCTAB nTab = rPos.Tab();
     SfxBindings* pBindings = rDocShell.GetViewBindings();
 
@@ -3369,7 +3372,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, false ) );
 
     if (bColumn)
         pDoc->RemoveColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
@@ -3379,7 +3382,7 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
     pDoc->UpdatePageBreaks( nTab );
 
     if (pDoc->IsStreamValid(nTab))
-        pDoc->SetStreamValid(nTab, FALSE);
+        pDoc->SetStreamValid(nTab, false);
 
     if (bColumn)
     {
@@ -3405,7 +3408,7 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
     if (bSetModified)
         aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -3435,7 +3438,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)
@@ -3489,7 +3492,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();
 
@@ -3564,18 +3567,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 false;
     }
 
     //  #i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached
@@ -3584,7 +3587,7 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
 
     ScRange aMarkRange;
     ScMarkData aMultiMark = rMark;
-    aMultiMark.SetMarking(FALSE);       // for MarkToMulti
+    aMultiMark.SetMarking(false);       // for MarkToMulti
     aMultiMark.MarkToMulti();
     aMultiMark.GetMultiMarkArea( aMarkRange );
 
@@ -3595,7 +3598,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 ) );
@@ -3608,21 +3611,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 false;
     }
 
     ScRange aMarkRange;
@@ -3642,7 +3645,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 ) );
@@ -3668,15 +3671,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 = false;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3686,14 +3689,14 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = 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();
@@ -3702,7 +3705,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;
@@ -3717,13 +3720,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, false, pUndoDoc, &aMark );
             if (bSize)
             {
                 pDoc->CopyToDocument( nStartCol,0,0, nEndCol,MAXROW,nTabCount-1,
-                                                            IDF_NONE, FALSE, pUndoDoc, &aMark );
+                                                            IDF_NONE, false, pUndoDoc, &aMark );
                 pDoc->CopyToDocument( 0,nStartRow,0, MAXCOL,nEndRow,nTabCount-1,
-                                                            IDF_NONE, FALSE, pUndoDoc, &aMark );
+                                                            IDF_NONE, false, pUndoDoc, &aMark );
             }
             pDoc->BeginDrawUndo();
         }
@@ -3738,8 +3741,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, false, sal_True);
+                    SetWidthOrHeight( false,1,nRows, nTab, SC_SIZE_VISOPT, 0, false, false);
                     rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
                                     PAINT_GRID | PAINT_LEFT | PAINT_TOP );
                 }
@@ -3749,8 +3752,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), false );
                     if (bAdj)
                         rDocShell.PostPaint( 0,nStartRow,nTab, MAXCOL,MAXROW,nTab,
                                             PAINT_GRID | PAINT_LEFT );
@@ -3776,13 +3779,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 = false;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3791,7 +3794,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)
@@ -3799,7 +3802,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 );
@@ -3814,7 +3817,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, false, pUndoDoc );
         }
 
         // use TokenArray if given, string (and flags) otherwise
@@ -3855,7 +3858,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());
@@ -3865,12 +3868,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 = false;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3880,7 +3883,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -3888,7 +3891,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 );
@@ -3901,7 +3904,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, false, pUndoDoc );
 
             rDocShell.GetUndoManager()->AddUndoAction(
                     new ScUndoTabOp( &rDocShell,
@@ -3916,7 +3919,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());
@@ -3938,12 +3941,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 = false;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3953,7 +3956,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -3961,7 +3964,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 );
@@ -4008,7 +4011,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, false, pUndoDoc, &aMark );
         }
 
         pDoc->Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(),
@@ -4027,7 +4030,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
         rDocShell.PostPaintGridAll();
         aModificator.SetDocumentModified();
 
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -4035,14 +4038,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 = false;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -4052,7 +4055,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -4060,7 +4063,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 );
@@ -4114,7 +4117,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, false, pUndoDoc, &aMark );
         }
 
         if (aDestArea.aStart.Col() <= aDestArea.aEnd.Col() &&
@@ -4144,7 +4147,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());
@@ -4152,15 +4155,15 @@ 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 )
 {
     double      fStep = 1.0;
     double      fMax = MAXDOUBLE;
     return FillAuto( rRange, pTabMark, eDir, FILL_AUTO, FILL_DAY, nCount, fStep, fMax, bRecord, bApi );
 }
 
-BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd  eDateCmd, ULONG nCount, double fStep, double fMax,  BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd  eDateCmd, sal_uLong nCount, double fStep, double fMax,  sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -4173,7 +4176,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -4181,7 +4184,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScRange aSourceArea = rRange;
@@ -4194,7 +4197,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
             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() ))
             {
                 OSL_FAIL("FillAuto: Row < 0");
                 nCount = aSourceArea.aStart.Row();
@@ -4205,7 +4208,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
             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() ))
             {
                 OSL_FAIL("FillAuto: Col < 0");
                 nCount = aSourceArea.aStart.Col();
@@ -4226,7 +4229,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return false;
     }
 
     if ( pDoc->HasSelectedBlockMatrixFragment( nStartCol, nStartRow,
@@ -4234,7 +4237,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_MATRIXFRAGMENTERR);
-        return FALSE;
+        return false;
     }
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
@@ -4255,7 +4258,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
         pDoc->CopyToDocument(
             aDestArea.aStart.Col(), aDestArea.aStart.Row(), 0,
             aDestArea.aEnd.Col(), aDestArea.aEnd.Row(), nTabCount-1,
-            IDF_AUTOFILL, FALSE, pUndoDoc, &aMark );
+            IDF_AUTOFILL, false, pUndoDoc, &aMark );
     }
 
     pDoc->Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(),
@@ -4276,12 +4279,12 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
     aModificator.SetDocumentModified();
 
     rRange = aDestArea;         // Zielbereich zurueckgeben (zum Markieren)
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::MergeCells( const ScCellMergeOption& rOption, sal_Bool bContents, sal_Bool bRecord, sal_Bool bApi )
 {
     using ::std::set;
 
@@ -4294,7 +4297,7 @@ BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BO
     if ((nStartCol == nEndCol && nStartRow == nEndRow) || rOption.maTabs.empty())
     {
         // Nothing to do.  Bail out quick.
-        return TRUE;
+        return true;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -4302,7 +4305,7 @@ BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BO
     SCTAB nTab1 = *itrBeg, nTab2 = *rOption.maTabs.rbegin();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
     {
@@ -4311,7 +4314,7 @@ BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BO
         {
             if (!bApi)
                 rDocShell.ErrorMessage(aTester.GetMessageId());
-            return FALSE;
+            return false;
         }
 
         if ( pDoc->HasAttrib( nStartCol, nStartRow, *itr, nEndCol, nEndRow, *itr,
@@ -4320,7 +4323,7 @@ BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BO
             // "Zusammenfassen nicht verschachteln !"
             if (!bApi)
                 rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
-            return FALSE;
+            return false;
         }
     }
 
@@ -4350,7 +4353,7 @@ BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BO
                 }
                 // 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, false, pUndoDoc );
             }
             if( bHasNotes )
                 pDoc->BeginDrawUndo();
@@ -4395,10 +4398,10 @@ BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BO
         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 )
 {
     ScCellMergeOption aOption(rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row());
     SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
@@ -4408,7 +4411,7 @@ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
     return UnmergeCells(aOption, bRecord, bApi);
 }
 
-bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi )
+bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool bRecord, sal_Bool bApi )
 {
     using ::std::set;
 
@@ -4420,7 +4423,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BO
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = false;
 
     ScDocument* pUndoDoc = NULL;
     bool bBeep = false;
@@ -4447,7 +4450,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BO
                 pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
                 pUndoDoc->InitUndo(pDoc, *rOption.maTabs.begin(), *rOption.maTabs.rbegin());
             }
-            pDoc->CopyToDocument(aExtended, IDF_ATTRIB, FALSE, pUndoDoc);
+            pDoc->CopyToDocument(aExtended, IDF_ATTRIB, false, pUndoDoc);
         }
 
         const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
@@ -4461,7 +4464,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BO
                               aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
                               SC_MF_HOR | SC_MF_VER );
 
-        pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
+        pDoc->ExtendMerge( aRefresh, sal_True, false );
 
         if ( !AdjustRowHeight( aExtended ) )
             rDocShell.PostPaint( aExtended, PAINT_GRID );
@@ -4476,7 +4479,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BO
     }
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -4520,7 +4523,7 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc )
 
     DBG_ASSERT( pNewRanges, "pNewRanges is 0" );
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     if (bUndo)
     {
@@ -4534,13 +4537,13 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc )
     // #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( false );  // CompileFormulaString
 
     if (bModifyDoc)
     {
@@ -4556,7 +4559,7 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc )
 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;
@@ -4581,7 +4584,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 );
@@ -4599,7 +4602,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
                             bInsert = true;
                         }
                         else if ( nResult == RET_CANCEL )
-                            rCancel = TRUE;
+                            rCancel = sal_True;
                     }
                 }
             }
@@ -4620,14 +4623,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 false;       // war nix
 
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = false;
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
     SCCOL nEndCol = rRange.aEnd.Col();
@@ -4635,26 +4638,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 = false;
     if ( nFlags & ( NAME_LEFT | NAME_RIGHT ) )
         if ( nStartCol == nEndCol )
-            bValid = FALSE;
+            bValid = false;
 
     if (bValid)
     {
         ScDocument* pDoc = rDocShell.GetDocument();
         ScRangeName* pNames = pDoc->GetRangeName();
         if (!pNames)
-            return FALSE;   // soll nicht sein
+            return 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;
@@ -4670,7 +4673,7 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
         if ( bRight )
             --nContX2;
 
-        BOOL bCancel = FALSE;
+        sal_Bool bCancel = false;
         SCCOL i;
         SCROW j;
 
@@ -4707,19 +4710,19 @@ 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 = 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 nValidCount = 0;
+    sal_uInt16 nValidCount = 0;
     ScRangeName::iterator itrBeg = pList->begin(), itrEnd = pList->end();
     for (ScRangeName::iterator itr = itrBeg; itr != itrEnd; ++itr)
     {
@@ -4743,13 +4746,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, false, pUndoDoc );
 
                 pDoc->BeginDrawUndo();      // wegen Hoehenanpassung
             }
 
             ScRangeData** ppSortArray = new ScRangeData* [ nValidCount ];
-            USHORT j = 0;
+            sal_uInt16 j = 0;
             for (ScRangeName::iterator itr = itrBeg; itr != itrEnd; ++itr)
             {
                 ScRangeData& r = *itr;
@@ -4787,7 +4790,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, false, pRedoDoc );
 
                 rDocShell.GetUndoManager()->AddUndoAction(
                     new ScUndoListNames( &rDocShell,
@@ -4799,7 +4802,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
                 rDocShell.PostPaint( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, PAINT_GRID );
 
             aModificator.SetDocumentModified();
-            bDone = TRUE;
+            bDone = sal_True;
         }
         else if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -4809,16 +4812,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 = false;
 
     String aFormula;
     pDoc->GetFormula( nStartCol, nStartRow, nTab, aFormula );
@@ -4833,17 +4836,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, 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, false, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
             }
         }
 
@@ -4856,15 +4859,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();
 
@@ -4872,9 +4875,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];
@@ -4907,7 +4910,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
@@ -4929,10 +4932,12 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
     }
 
     //  Update hat sein eigenes Undo
-
-    pLink->SetDoInsert(bFitBlock);  // beim ersten Update ggf. nichts einfuegen
-    pLink->Update();                // kein SetInCreate -> Update ausfuehren
-    pLink->SetDoInsert(TRUE);       // Default = TRUE
+    if (pDoc->IsExecuteLinkEnabled())
+    {
+        pLink->SetDoInsert(bFitBlock);  // beim ersten Update ggf. nichts einfuegen
+        pLink->Update();                // kein SetInCreate -> Update ausfuehren
+    }
+    pLink->SetDoInsert(sal_True);       // Default = sal_True
 
     SfxBindings* pBindings = rDocShell.GetViewBindings();
     if (pBindings)
@@ -4940,7 +4945,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );     // Navigator
 
-    return TRUE;
+    return sal_True;
 }