CWS swlayoutrefactoring: resync to m100

1 files changed, 195 insertions, 184 deletions

diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 1d5dcd435c04..83774f5f0559 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -86,19 +86,19 @@ using namespace ::com::sun::star;
 
 
 void lcl_FillSvxColumn(const SwFmtCol& rCol,
-                          USHORT nTotalWidth,
+                          sal_uInt16 nTotalWidth,
                           SvxColumnItem& rColItem,
                           long nDistance)
 {
     const SwColumns& rCols = rCol.GetColumns();
-    USHORT nWidth = 0;
+    sal_uInt16 nWidth = 0;
 
-    BOOL bOrtho = rCol.IsOrtho() && rCols.Count();
+    sal_Bool bOrtho = rCol.IsOrtho() && rCols.Count();
     long nInnerWidth = 0;
     if( bOrtho )
     {
         nInnerWidth = nTotalWidth;
-        for ( USHORT i = 0; i < rCols.Count(); ++i )
+        for ( sal_uInt16 i = 0; i < rCols.Count(); ++i )
         {
             SwColumn* pCol = rCols[i];
             nInnerWidth -= pCol->GetLeft() + pCol->GetRight();
@@ -108,17 +108,17 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol,
         else
             nInnerWidth /= rCols.Count();
     }
-    for ( USHORT i = 0; i < rCols.Count(); ++i )
+    for ( sal_uInt16 i = 0; i < rCols.Count(); ++i )
     {
         SwColumn* pCol = rCols[i];
-        const USHORT nStart = USHORT(pCol->GetLeft() + nWidth + nDistance);
+        const sal_uInt16 nStart = sal_uInt16(pCol->GetLeft() + nWidth + nDistance);
         if( bOrtho )
-            nWidth = static_cast< USHORT >(nWidth + nInnerWidth + pCol->GetLeft() + pCol->GetRight());
+            nWidth = static_cast< sal_uInt16 >(nWidth + nInnerWidth + pCol->GetLeft() + pCol->GetRight());
         else
-            nWidth = static_cast< USHORT >(nWidth + rCol.CalcColWidth(i, nTotalWidth));
-        const USHORT nEnd = USHORT(nWidth - pCol->GetRight() + nDistance);
+            nWidth = static_cast< sal_uInt16 >(nWidth + rCol.CalcColWidth(i, nTotalWidth));
+        const sal_uInt16 nEnd = sal_uInt16(nWidth - pCol->GetRight() + nDistance);
 
-        SvxColumnDescription aColDesc(nStart, nEnd, TRUE);
+        SvxColumnDescription aColDesc(nStart, nEnd, sal_True);
         rColItem.Append(aColDesc);
     }
 }
@@ -129,7 +129,7 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol,
 
 
 void lcl_ConvertToCols(const SvxColumnItem& rColItem,
-                          USHORT nTotalWidth,
+                          sal_uInt16 nTotalWidth,
                           SwFmtCol& rCols)
 {
     ASSERT( rCols.GetNumCols() == rColItem.Count(), "Column count mismatch" );
@@ -138,27 +138,27 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
     if(rCols.GetNumCols() != rColItem.Count())
         return;
 
-    USHORT nLeft    = 0;
+    sal_uInt16 nLeft    = 0;
     SwTwips nSumAll= 0;  // Summiere alle Spalten und Raender auf
 
     SwColumns& rArr = rCols.GetColumns();
 
     // Tabcols der Reihe nach
-    for( USHORT i=0; i < rColItem.Count()-1; ++i )
+    for( sal_uInt16 i=0; i < rColItem.Count()-1; ++i )
     {
         DBG_ASSERT(rColItem[i+1].nStart >= rColItem[i].nEnd,"\201berlappende Spalten" );
-        USHORT nStart = static_cast< USHORT >(rColItem[i+1].nStart);
-        USHORT nEnd = static_cast< USHORT >(rColItem[i].nEnd);
+        sal_uInt16 nStart = static_cast< sal_uInt16 >(rColItem[i+1].nStart);
+        sal_uInt16 nEnd = static_cast< sal_uInt16 >(rColItem[i].nEnd);
         if(nStart < nEnd)
             nStart = nEnd;
-        const USHORT nDiff  = nStart - nEnd;
-        const USHORT nRight = nDiff / 2;
+        const sal_uInt16 nDiff  = nStart - nEnd;
+        const sal_uInt16 nRight = nDiff / 2;
 
-        USHORT nWidth = static_cast< USHORT >(rColItem[i].nEnd - rColItem[i].nStart);
+        sal_uInt16 nWidth = static_cast< sal_uInt16 >(rColItem[i].nEnd - rColItem[i].nStart);
         nWidth += nLeft + nRight;
 
         SwColumn* pCol = rArr[i];
-        pCol->SetWishWidth( USHORT(long(rCols.GetWishWidth()) * long(nWidth) /
+        pCol->SetWishWidth( sal_uInt16(long(rCols.GetWishWidth()) * long(nWidth) /
                                                             long(nTotalWidth) ));
         pCol->SetLeft( nLeft );
         pCol->SetRight( nRight );
@@ -170,9 +170,9 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
 
     //Die Differenz aus der Gesamtwunschbreite und der Summe der bisher berechneten
     // Spalten und Raender sollte die Breite der letzten Spalte ergeben.
-    rArr[rColItem.Count()-1]->SetWishWidth( rCols.GetWishWidth() - (USHORT)nSumAll );
+    rArr[rColItem.Count()-1]->SetWishWidth( rCols.GetWishWidth() - (sal_uInt16)nSumAll );
 
-    rCols.SetOrtho(FALSE, 0, 0 );
+    rCols.SetOrtho(sal_False, 0, 0 );
 }
 
 /*--------------------------------------------------------------------
@@ -183,7 +183,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
 void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
 {
     // Def Tabs loeschen
-    for ( USHORT i = 0; i < rTabStops.Count(); )
+    for ( sal_uInt16 i = 0; i < rTabStops.Count(); )
     {
         // Hier auch den DefTab auf Null rausschmeissen
         if ( SVX_TAB_ADJUST_DEFAULT == rTabStops[i].GetAdjustment() ||
@@ -203,7 +203,7 @@ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
 
 void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
 {
-    USHORT nPhyPage, nVirPage;
+    sal_uInt16 nPhyPage, nVirPage;
     GetWrtShell().GetPageNum( nPhyPage, nVirPage );
 
     if ( rDesc.GetUseOn() == nsUseOnPage::PD_MIRROR && (nPhyPage % 2) == 0 )
@@ -239,30 +239,30 @@ void ResizeFrameCols(SwFmtCol& rCol,
     {
         // wenn die Wunschbreite zu gross wird, dann muessen alle Werte passend skaliert werden
         long nScale = (0xffffl << 8)/ nNewWishWidth;
-        for(USHORT i = 0; i < rArr.Count(); i++)
+        for(sal_uInt16 i = 0; i < rArr.Count(); i++)
         {
             SwColumn* pCol = rArr.GetObject(i);
             long nVal = pCol->GetWishWidth();
             lcl_Scale(nVal, nScale);
-            pCol->SetWishWidth((USHORT) nVal);
+            pCol->SetWishWidth((sal_uInt16) nVal);
             nVal = pCol->GetLeft();
             lcl_Scale(nVal, nScale);
-            pCol->SetLeft((USHORT) nVal);
+            pCol->SetLeft((sal_uInt16) nVal);
             nVal = pCol->GetRight();
             lcl_Scale(nVal, nScale);
-            pCol->SetRight((USHORT) nVal);
+            pCol->SetRight((sal_uInt16) nVal);
         }
         lcl_Scale(nNewWishWidth, nScale);
         lcl_Scale(nWishDiff, nScale);
     }
-    rCol.SetWishWidth( (USHORT) (nNewWishWidth) );
+    rCol.SetWishWidth( (sal_uInt16) (nNewWishWidth) );
 
     if( nLeftDelta >= 2 || nLeftDelta <= -2)
-        rArr[0]->SetWishWidth(rArr[0]->GetWishWidth() + (USHORT)nWishDiff);
+        rArr[0]->SetWishWidth(rArr[0]->GetWishWidth() + (sal_uInt16)nWishDiff);
     else
-        rArr[rArr.Count()-1]->SetWishWidth(rArr[rArr.Count()-1]->GetWishWidth() + (USHORT)nWishDiff);
+        rArr[rArr.Count()-1]->SetWishWidth(rArr[rArr.Count()-1]->GetWishWidth() + (sal_uInt16)nWishDiff);
     //reset auto width
-    rCol.SetOrtho(FALSE, 0, 0 );
+    rCol.SetOrtho(sal_False, 0, 0 );
 }
 /*--------------------------------------------------------------------
     Beschreibung:   Hier werden alle Aenderungen der Tableiste
@@ -273,17 +273,24 @@ void ResizeFrameCols(SwFmtCol& rCol,
 void SwView::ExecTabWin( SfxRequest& rReq )
 {
     SwWrtShell &rSh         = GetWrtShell();
-    const USHORT nFrmType   = rSh.IsObjSelected() ?
+    const sal_uInt16 nFrmType   = rSh.IsObjSelected() ?
                                     FRMTYPE_DRAWOBJ :
+<<<<<<< local
                                         rSh.GetFrmType(0,TRUE);
     const BOOL  bFrmSelection = rSh.IsFrmSelected();
     const BOOL bBrowse = rSh.GetViewOptions()->getBrowseMode();
+=======
+                                        rSh.GetFrmType(0,sal_True);
+    const sal_Bool  bFrmSelection = rSh.IsFrmSelected();
+    const sal_Bool bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
 
-    const USHORT nSlot      = rReq.GetSlot();
-    const USHORT nDescId    = rSh.GetCurPageDesc();
+>>>>>>> other
+
+    const sal_uInt16 nSlot      = rReq.GetSlot();
+    const sal_uInt16 nDescId    = rSh.GetCurPageDesc();
     const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId );
 
-    const BOOL bVerticalWriting = rSh.IsInVerticalText();
+    const sal_Bool bVerticalWriting = rSh.IsInVerticalText();
     const SwFmtHeader& rHeaderFmt = rDesc.GetMaster().GetHeader();
     SwFrmFmt *pHeaderFmt = (SwFrmFmt*)rHeaderFmt.GetHeaderFmt();
 
@@ -296,9 +303,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
     const long nPageWidth  = bBrowse ? rPageRect.Width() : rFrmSize.GetWidth();
     const long nPageHeight = bBrowse ? rPageRect.Height() : rFrmSize.GetHeight();
 
-    BOOL bUnlockView = FALSE;
+    sal_Bool bUnlockView = sal_False;
     rSh.StartAllAction();
-    BOOL bSect = 0 != (nFrmType & FRMTYPE_COLSECT);
+    sal_Bool bSect = 0 != (nFrmType & FRMTYPE_COLSECT);
 
     switch  ( nSlot )
     {
@@ -312,8 +319,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             SwFrmFmt* pFmt = ((SwFrmFmt*)rSh.GetFlyFrmFmt());
             const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
 
-            BOOL bRTL;
-            BOOL bVerticalFrame = (bFrmSelection && rSh.IsFrmVertical(TRUE, bRTL))|| (!bFrmSelection && bVerticalWriting);
+            sal_Bool bRTL;
+            sal_Bool bVerticalFrame = (bFrmSelection && rSh.IsFrmVertical(sal_True, bRTL))|| (!bFrmSelection && bVerticalWriting);
             long nDeltaX = bVerticalFrame ?
                 rRect.Right() - rPageRect.Right() + aLongLR.GetRight() :
                 rPageRect.Left() + aLongLR.GetLeft() - rRect.Left();
@@ -345,7 +352,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 SwRect aRect;
                 rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
                 long nPrtWidth = aRect.Width();
-                aSize.SetWidthPercent(BYTE((nPageWidth - aLongLR.GetLeft() - aLongLR.GetRight()) * 100 /nPrtWidth));
+                aSize.SetWidthPercent(sal_uInt8((nPageWidth - aLongLR.GetLeft() - aLongLR.GetRight()) * 100 /nPrtWidth));
             }
             else
                 aSize.SetWidth( nPageWidth -
@@ -380,9 +387,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             aLongLR.SetLeft( nOld > aLongLR.GetLeft() ? 0 : aLongLR.GetLeft() - nOld );
 
             nOld = rDesc.GetMaster().GetLRSpace().GetRight();
-            aLongLR.SetRight( nOld > (USHORT)aLongLR.GetRight() ? 0 : aLongLR.GetRight() - nOld );
-            aLR.SetLeft((USHORT)aLongLR.GetLeft());
-            aLR.SetRight((USHORT)aLongLR.GetRight());
+            aLongLR.SetRight( nOld > (sal_uInt16)aLongLR.GetRight() ? 0 : aLongLR.GetRight() - nOld );
+            aLR.SetLeft((sal_uInt16)aLongLR.GetLeft());
+            aLR.SetRight((sal_uInt16)aLongLR.GetRight());
 
             if ( nFrmType & FRMTYPE_HEADER && pHeaderFmt )
                 pHeaderFmt->SetFmtAttr( aLR );
@@ -426,8 +433,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
         }
         else
         {   // Seitenraender einstellen
-            aLR.SetLeft((USHORT)aLongLR.GetLeft());
-            aLR.SetRight((USHORT)aLongLR.GetRight());
+            aLR.SetLeft((sal_uInt16)aLongLR.GetLeft());
+            aLR.SetRight((sal_uInt16)aLongLR.GetRight());
             SwapPageMargin( rDesc, aLR );
             SwPageDesc aDesc( rDesc );
             aDesc.GetMaster().SetFmtAttr( aLR );
@@ -450,8 +457,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             SfxItemSet aSet( GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
                                         RES_VERT_ORIENT, RES_HORI_ORIENT, 0 );
             //which of the orientation attributes is to be put depends on the frame's environment
-            BOOL bRTL;
-            if((bFrmSelection && rSh.IsFrmVertical(TRUE, bRTL))|| (!bFrmSelection && bVerticalWriting))
+            sal_Bool bRTL;
+            if((bFrmSelection && rSh.IsFrmVertical(sal_True, bRTL))|| (!bFrmSelection && bVerticalWriting))
             {
                 SwFmtHoriOrient aHoriOrient(pFmt->GetHoriOrient());
                 aHoriOrient.SetHoriOrient(text::HoriOrientation::NONE);
@@ -471,7 +478,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 SwRect aRect;
                 rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
                 long nPrtHeight = aRect.Height();
-                aSize.SetHeightPercent(BYTE(nHeight * 100 /nPrtHeight));
+                aSize.SetHeightPercent(sal_uInt8(nHeight * 100 /nPrtHeight));
             }
             else
                 aSize.SetHeight(nHeight );
@@ -520,12 +527,12 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             if ( nFrmType & ( FRMTYPE_HEADER | FRMTYPE_FOOTER ))
             {
 
-                const BOOL bHead = nFrmType & FRMTYPE_HEADER ? TRUE : FALSE;
+                const sal_Bool bHead = nFrmType & FRMTYPE_HEADER ? sal_True : sal_False;
                 SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() );
                 if ( bHead )
-                    aUL.SetUpper( (USHORT)aLongULSpace.GetUpper() );
+                    aUL.SetUpper( (sal_uInt16)aLongULSpace.GetUpper() );
                 else
-                    aUL.SetLower( (USHORT)aLongULSpace.GetLower() );
+                    aUL.SetLower( (sal_uInt16)aLongULSpace.GetLower() );
                 aDesc.GetMaster().SetFmtAttr( aUL );
 
                 if( (bHead && pHeaderFmt) || (!bHead && pFooterFmt) )
@@ -544,8 +551,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             else
             {
                 SvxULSpaceItem aUL(RES_UL_SPACE);
-                aUL.SetUpper((USHORT)aLongULSpace.GetUpper());
-                aUL.SetLower((USHORT)aLongULSpace.GetLower());
+                aUL.SetUpper((sal_uInt16)aLongULSpace.GetUpper());
+                aUL.SetLower((sal_uInt16)aLongULSpace.GetLower());
                 aDesc.GetMaster().SetFmtAttr(aUL);
             }
 
@@ -556,7 +563,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
     case SID_ATTR_TABSTOP_VERTICAL:
     case SID_ATTR_TABSTOP:
     {
-        USHORT nWhich = GetPool().GetWhich(nSlot);
+        sal_uInt16 nWhich = GetPool().GetWhich(nSlot);
         SvxTabStopItem aTabStops( (const SvxTabStopItem&)rReq.GetArgs()->
                                                     Get( nWhich ));
         aTabStops.SetWhich(RES_PARATR_TABSTOP);
@@ -575,7 +582,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
         }
 
         // auffuellen mit Default-Tabs
-        USHORT nDef = ::GetTabDist( rDefTabs );
+        sal_uInt16 nDef = ::GetTabDist( rDefTabs );
         ::MakeDefTabs( nDef, aTabStops );
 
         SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
@@ -600,12 +607,12 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             sal_Bool bLastColumn = sal_True;
             if(nFrmType & FRMTYPE_COLUMN)
             {
-                USHORT nCurFrameCol = rSh.GetCurColNum() - 1;
+                sal_uInt16 nCurFrameCol = rSh.GetCurColNum() - 1;
                 bFirstColumn = !nCurFrameCol;
                 const SwFrmFmt* pFmt =  rSh.GetFlyFrmFmt();
                 const SwFmtCol* pCols = &pFmt->GetCol();
                 const SwColumns& rCols = pCols->GetColumns();
-                USHORT nColumnCount = rCols.Count();
+                sal_uInt16 nColumnCount = rCols.Count();
                 bLastColumn = nColumnCount == nCurFrameCol + 1;
             }
         }
@@ -653,7 +660,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             const SvxTabStopItem&  rTabStops = (const SvxTabStopItem&)aSet.Get(RES_PARATR_TABSTOP);
 
             // Haben wir einen Tab an Stelle Null
-            USHORT i;
+            sal_uInt16 i;
 
             for ( i = 0; i < rTabStops.Count(); ++i )
                 if ( rTabStops[i].GetTabPos() == 0 )
@@ -672,7 +679,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
                 const SvxTabStopItem& rDefTabs =
                     (const SvxTabStopItem&)rSh.GetDefault(RES_PARATR_TABSTOP);
-                USHORT nDef = ::GetTabDist(rDefTabs);
+                sal_uInt16 nDef = ::GetTabDist(rDefTabs);
                 ::MakeDefTabs( nDef, aTabStops );
 
                 if( pColl && pColl->IsAutoUpdateFmt())
@@ -697,7 +704,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
         {
             ASSERT(aColItem.Count(), "ColDesc ist leer!!");
 
-            const BOOL bSingleLine = ((const SfxBoolItem&)rReq.
+            const sal_Bool bSingleLine = ((const SfxBoolItem&)rReq.
                             GetArgs()->Get(SID_RULER_ACT_LINE_ONLY)).GetValue();
 
             SwTabCols aTabCols;
@@ -725,14 +732,14 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             // Tabcols der Reihe nach
             // Die letzte Col wird durch den Rand definiert
             //columns in right-to-left tables need to be mirrored
-            BOOL bIsTableRTL =
+            sal_Bool bIsTableRTL =
                 IsTabColFromDoc() ?
                       rSh.IsMouseTableRightToLeft(aTabColFromDocPos)
                     : rSh.IsTableRightToLeft();
             if(bIsTableRTL)
             {
-                USHORT nColCount = aColItem.Count() - 1;
-                for ( USHORT i = 0; i < nColCount; ++i )
+                sal_uInt16 nColCount = aColItem.Count() - 1;
+                for ( sal_uInt16 i = 0; i < nColCount; ++i )
                 {
                     const SvxColumnDescription& rCol = aColItem[nColCount - i];
                     aTabCols[i] = aTabCols.GetRight() - rCol.nStart;
@@ -741,7 +748,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             }
             else
             {
-                for ( USHORT i = 0; i < aColItem.Count()-1; ++i )
+                for ( sal_uInt16 i = 0; i < aColItem.Count()-1; ++i )
                 {
                     const SvxColumnDescription& rCol = aColItem[i];
                     aTabCols[i] = rCol.nEnd + aTabCols.GetLeft();
@@ -753,8 +760,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             {
                 if( !rSh.IsViewLocked() )
                 {
-                    bUnlockView = TRUE;
-                    rSh.LockView( TRUE );
+                    bUnlockView = sal_True;
+                    rSh.LockView( sal_True );
                 }
                 rSh.SetMouseTabCols( aTabCols, bSingleLine,
                                                aTabColFromDocPos );
@@ -782,10 +789,10 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 SwFmtCol aCols(
                     bSect ?
                         pSectFmt->GetCol() :
-                            (const SwFmtCol&)aSet.Get( RES_COL, FALSE ));
+                            (const SwFmtCol&)aSet.Get( RES_COL, sal_False ));
                 SwRect aCurRect = rSh.GetAnyCurRect(bSect ? RECT_SECTION_PRT : RECT_FLY_PRT_EMBEDDED);
                 const long lWidth = bVerticalWriting ? aCurRect.Height() : aCurRect.Width();
-                ::lcl_ConvertToCols( aColItem, USHORT(lWidth), aCols );
+                ::lcl_ConvertToCols( aColItem, sal_uInt16(lWidth), aCols );
                 aSet.Put( aCols );
                 if(bSect)
                     rSh.SetSectionAttr( aSet, pSectFmt );
@@ -809,7 +816,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 SwFmtCol aCols( rDesc.GetMaster().GetCol() );
                 const SwRect aPrtRect = rSh.GetAnyCurRect(RECT_PAGE_PRT);
                 ::lcl_ConvertToCols( aColItem,
-                    USHORT(bVerticalWriting ? aPrtRect.Height() : aPrtRect.Width()),
+                    sal_uInt16(bVerticalWriting ? aPrtRect.Height() : aPrtRect.Width()),
                                 aCols );
                 SwPageDesc aDesc( rDesc );
                 aDesc.GetMaster().SetFmtAttr( aCols );
@@ -848,7 +855,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
             if(bVerticalWriting)
             {
-                for ( USHORT i = aColItem.Count() - 1; i; --i )
+                for ( sal_uInt16 i = aColItem.Count() - 1; i; --i )
                 {
                     const SvxColumnDescription& rCol = aColItem[i - 1];
                     long nColumnPos = aTabCols.GetRight() - rCol.nEnd ;
@@ -858,23 +865,23 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             }
             else
             {
-                for ( USHORT i = 0; i < aColItem.Count()-1; ++i )
+                for ( sal_uInt16 i = 0; i < aColItem.Count()-1; ++i )
                 {
                     const SvxColumnDescription& rCol = aColItem[i];
                     aTabCols[i] = rCol.nEnd + aTabCols.GetLeft();
                     aTabCols.SetHidden( i, !rCol.bVisible );
                 }
             }
-            BOOL bSingleLine = FALSE;
+            sal_Bool bSingleLine = sal_False;
             const SfxPoolItem* pSingleLine;
-            if( SFX_ITEM_SET == rReq.GetArgs()->GetItemState(SID_RULER_ACT_LINE_ONLY, FALSE, &pSingleLine))
+            if( SFX_ITEM_SET == rReq.GetArgs()->GetItemState(SID_RULER_ACT_LINE_ONLY, sal_False, &pSingleLine))
                 bSingleLine = ((const SfxBoolItem*)pSingleLine)->GetValue();
             if ( bSetTabRowFromDoc )
             {
                 if( !rSh.IsViewLocked() )
                 {
-                    bUnlockView = TRUE;
-                    rSh.LockView( TRUE );
+                    bUnlockView = sal_True;
+                    rSh.LockView( sal_True );
                 }
                 rSh.SetMouseTabRows( aTabCols, bSingleLine, aTabColFromDocPos );
             }
@@ -890,9 +897,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
     rSh.EndAllAction();
 
     if( bUnlockView )
-        rSh.LockView( FALSE );
+        rSh.LockView( sal_False );
 
-    bSetTabColFromDoc = bSetTabRowFromDoc = bTabColFromDoc = bTabRowFromDoc = FALSE;
+    bSetTabColFromDoc = bSetTabRowFromDoc = bTabColFromDoc = bTabRowFromDoc = sal_False;
     SetNumRuleNodeFromDoc(NULL);
 }
 
@@ -908,13 +915,17 @@ void SwView::StateTabWin(SfxItemSet& rSet)
     SwWrtShell &rSh         = GetWrtShell();
 
     const Point* pPt = IsTabColFromDoc() || IsTabRowFromDoc() ? &aTabColFromDocPos : 0;
-    const USHORT nFrmType   = rSh.IsObjSelected()
+    const sal_uInt16 nFrmType   = rSh.IsObjSelected()
                 ? FRMTYPE_DRAWOBJ
-                : rSh.GetFrmType( pPt, TRUE );
+                : rSh.GetFrmType( pPt, sal_True );
 
-    const BOOL  bFrmSelection = rSh.IsFrmSelected();
+    const sal_Bool  bFrmSelection = rSh.IsFrmSelected();
 
+<<<<<<< local
     const BOOL bBrowse = rSh.GetViewOptions()->getBrowseMode();
+=======
+    const sal_Bool bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
+>>>>>>> other
     // PageOffset/Begrenzer
     const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, pPt );
     const SwRect& rPagePrtRect = rSh.GetAnyCurRect( RECT_PAGE_PRT, pPt );
@@ -926,7 +937,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     rSh.GetMousePageDesc(aTabColFromDocPos) : rSh.GetCurPageDesc() );
 
     const SvxFrameDirectionItem& rFrameDir = rDesc.GetMaster().GetFrmDir();
-    const BOOL bVerticalWriting = rSh.IsInVerticalText();
+    const sal_Bool bVerticalWriting = rSh.IsInVerticalText();
 
     //enable tab stop display on the rulers depending on the writing direction
     WinBits nRulerStyle = pHRuler->GetStyle() & ~WB_EXTRAFIELD;
@@ -951,7 +962,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
     SelectionType nSelType = rSh.GetSelectionType();
 
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     sal_Bool bPutContentProtection = sal_False;
 
     while ( nWhich )
@@ -1035,15 +1046,15 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             {
                 // Dokumentkoordinaten Frame auf Seitenkoordinaten umbrechen
                 const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED, pPt);
-                aLongUL.SetUpper((USHORT)(rRect.Top() - rPageRect.Top() ));
-                aLongUL.SetLower((USHORT)(rPageRect.Bottom() - rRect.Bottom() ));
+                aLongUL.SetUpper((sal_uInt16)(rRect.Top() - rPageRect.Top() ));
+                aLongUL.SetLower((sal_uInt16)(rPageRect.Bottom() - rRect.Bottom() ));
             }
             else if ( nFrmType & FRMTYPE_HEADER || nFrmType & FRMTYPE_FOOTER )
             {
                 SwRect aRect( rSh.GetAnyCurRect( RECT_HEADERFOOTER, pPt));
                 aRect.Pos() -= rSh.GetAnyCurRect( RECT_PAGE, pPt ).Pos();
-                aLongUL.SetUpper( (USHORT)aRect.Top() );
-                aLongUL.SetLower( (USHORT)(nPageHeight - aRect.Bottom()) );
+                aLongUL.SetUpper( (sal_uInt16)aRect.Top() );
+                aLongUL.SetLower( (sal_uInt16)(nPageHeight - aRect.Bottom()) );
             }
             else if( nFrmType & FRMTYPE_DRAWOBJ)
             {
@@ -1060,8 +1071,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 rSet.Put( aLongUL );
             else
             {
-                SvxULSpaceItem aULTmp((USHORT)aLongUL.GetUpper(),
-                                      (USHORT)aLongUL.GetLower(),
+                SvxULSpaceItem aULTmp((sal_uInt16)aLongUL.GetUpper(),
+                                      (sal_uInt16)aLongUL.GetLower(),
                                       nWhich);
                 rSet.Put(aULTmp);
             }
@@ -1124,7 +1135,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         short nOffset = static_cast< short >(aLR.GetTxtLeft() +
                                         // --> FME 2005-02-22 #i42922# Mouse move of numbering label
                                         // has to consider the left indent of the paragraph
-                                        pNumRuleNodeFromDoc->GetLeftMarginWithNum( TRUE ) );
+                                        pNumRuleNodeFromDoc->GetLeftMarginWithNum( sal_True ) );
                                        // <--
 
                         short nFLOffset;
@@ -1167,8 +1178,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         aCoreSet.Put( aBoxInfo );
                         rSh.GetFlyFrmAttr( aCoreSet );
                         const SvxBoxItem& rBox = (const SvxBoxItem&)aCoreSet.Get(RES_BOX);
-                        aDistLR.SetLeft((USHORT)rBox.GetDistance(BOX_LINE_LEFT ));
-                        aDistLR.SetRight((USHORT)rBox.GetDistance(BOX_LINE_RIGHT));
+                        aDistLR.SetLeft((sal_uInt16)rBox.GetDistance(BOX_LINE_LEFT ));
+                        aDistLR.SetRight((sal_uInt16)rBox.GetDistance(BOX_LINE_RIGHT));
 
                         //add the paragraph border distance
                         SfxItemSet aCoreSet1( GetPool(),
@@ -1176,12 +1187,12 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                                 0 );
                         rSh.GetCurAttr( aCoreSet1 );
                         const SvxBoxItem& rParaBox = (const SvxBoxItem&)aCoreSet1.Get(RES_BOX);
-                        aDistLR.SetLeft(aDistLR.GetLeft() + (USHORT)rParaBox.GetDistance(BOX_LINE_LEFT ));
-                        aDistLR.SetRight(aDistLR.GetRight() + (USHORT)rParaBox.GetDistance(BOX_LINE_RIGHT));
+                        aDistLR.SetLeft(aDistLR.GetLeft() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_LEFT ));
+                        aDistLR.SetRight(aDistLR.GetRight() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_RIGHT));
                     }
                     rSet.Put(aDistLR);
-                    nLeftBorderDistance  = static_cast< USHORT >(aDistLR.GetLeft());
-                    nRightBorderDistance = static_cast< USHORT >(aDistLR.GetRight());
+                    nLeftBorderDistance  = static_cast< sal_uInt16 >(aDistLR.GetLeft());
+                    nRightBorderDistance = static_cast< sal_uInt16 >(aDistLR.GetRight());
                 }
                 else if ( IsTabColFromDoc() ||
                     ( rSh.GetTableFmt() && !bFrmSelection &&
@@ -1191,13 +1202,13 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                             RES_BOX, RES_BOX,
                                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
                     SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
-                    aBoxInfo.SetTable(FALSE);
-                    aBoxInfo.SetDist((BOOL) TRUE);
+                    aBoxInfo.SetTable(sal_False);
+                    aBoxInfo.SetDist((sal_Bool) sal_True);
                     aCoreSet2.Put(aBoxInfo);
                     rSh.GetTabBorders( aCoreSet2 );
                     const SvxBoxItem& rBox = (const SvxBoxItem&)aCoreSet2.Get(RES_BOX);
-                    aDistLR.SetLeft((USHORT)rBox.GetDistance(BOX_LINE_LEFT ));
-                    aDistLR.SetRight((USHORT)rBox.GetDistance(BOX_LINE_RIGHT));
+                    aDistLR.SetLeft((sal_uInt16)rBox.GetDistance(BOX_LINE_LEFT ));
+                    aDistLR.SetRight((sal_uInt16)rBox.GetDistance(BOX_LINE_RIGHT));
 
                     //add the border distance of the paragraph
                     SfxItemSet aCoreSet1( GetPool(),
@@ -1205,19 +1216,19 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                             0 );
                     rSh.GetCurAttr( aCoreSet1 );
                     const SvxBoxItem& rParaBox = (const SvxBoxItem&)aCoreSet1.Get(RES_BOX);
-                    aDistLR.SetLeft(aDistLR.GetLeft() + (USHORT)rParaBox.GetDistance(BOX_LINE_LEFT ));
-                    aDistLR.SetRight(aDistLR.GetRight() + (USHORT)rParaBox.GetDistance(BOX_LINE_RIGHT));
+                    aDistLR.SetLeft(aDistLR.GetLeft() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_LEFT ));
+                    aDistLR.SetRight(aDistLR.GetRight() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_RIGHT));
                     rSet.Put(aDistLR);
-                    nLeftBorderDistance  = static_cast< USHORT >(aDistLR.GetLeft());
-                    nRightBorderDistance = static_cast< USHORT >(aDistLR.GetRight());
+                    nLeftBorderDistance  = static_cast< sal_uInt16 >(aDistLR.GetLeft());
+                    nRightBorderDistance = static_cast< sal_uInt16 >(aDistLR.GetRight());
                 }
                 else if ( !rSh.IsDirectlyInSection() )
                 {
                     //get the page/header/footer border distance
                     const SwFrmFmt& rMaster = rDesc.GetMaster();
                     const SvxBoxItem& rBox = (const SvxBoxItem&)rMaster.GetAttrSet().Get(RES_BOX);
-                    aDistLR.SetLeft((USHORT)rBox.GetDistance(BOX_LINE_LEFT ));
-                    aDistLR.SetRight((USHORT)rBox.GetDistance(BOX_LINE_RIGHT));
+                    aDistLR.SetLeft((sal_uInt16)rBox.GetDistance(BOX_LINE_LEFT ));
+                    aDistLR.SetRight((sal_uInt16)rBox.GetDistance(BOX_LINE_RIGHT));
 
                     const SvxBoxItem* pBox = 0;
                     if(nFrmType & FRMTYPE_HEADER)
@@ -1237,8 +1248,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     }
                     if(pBox)
                     {
-                        aDistLR.SetLeft((USHORT)pBox->GetDistance(BOX_LINE_LEFT ));
-                        aDistLR.SetRight((USHORT)pBox->GetDistance(BOX_LINE_RIGHT));
+                        aDistLR.SetLeft((sal_uInt16)pBox->GetDistance(BOX_LINE_LEFT ));
+                        aDistLR.SetRight((sal_uInt16)pBox->GetDistance(BOX_LINE_RIGHT));
                     }
 
                     //add the border distance of the paragraph
@@ -1247,11 +1258,11 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
                     rSh.GetCurAttr( aCoreSetTmp );
                     const SvxBoxItem& rParaBox = (const SvxBoxItem&)aCoreSetTmp.Get(RES_BOX);
-                    aDistLR.SetLeft(aDistLR.GetLeft() + (USHORT)rParaBox.GetDistance(BOX_LINE_LEFT ));
-                    aDistLR.SetRight(aDistLR.GetRight() + (USHORT)rParaBox.GetDistance(BOX_LINE_RIGHT));
+                    aDistLR.SetLeft(aDistLR.GetLeft() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_LEFT ));
+                    aDistLR.SetRight(aDistLR.GetRight() + (sal_uInt16)rParaBox.GetDistance(BOX_LINE_RIGHT));
                     rSet.Put(aDistLR);
-                    nLeftBorderDistance  = static_cast< USHORT >(aDistLR.GetLeft());
-                    nRightBorderDistance = static_cast< USHORT >(aDistLR.GetRight());
+                    nLeftBorderDistance  = static_cast< sal_uInt16 >(aDistLR.GetLeft());
+                    nRightBorderDistance = static_cast< sal_uInt16 >(aDistLR.GetRight());
                 }
             }
         }
@@ -1265,7 +1276,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 rSet.DisableItem(nWhich);
             else
             {
-                BOOL bFlag = rSh.IsInRightToLeftText();
+                sal_Bool bFlag = rSh.IsInRightToLeftText();
                 rSet.Put(SfxBoolItem(nWhich, bFlag));
             }
         }
@@ -1273,13 +1284,13 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         case SID_RULER_BORDERS_VERTICAL:
         case SID_RULER_BORDERS:
         {
-            BOOL bFrameRTL;
-            BOOL bFrameHasVerticalColumns =  rSh.IsFrmVertical(FALSE, bFrameRTL) && bFrmSelection;
-            BOOL bHasTable = ( IsTabColFromDoc() ||
+            sal_Bool bFrameRTL;
+            sal_Bool bFrameHasVerticalColumns =  rSh.IsFrmVertical(sal_False, bFrameRTL) && bFrmSelection;
+            sal_Bool bHasTable = ( IsTabColFromDoc() ||
                     ( rSh.GetTableFmt() && !bFrmSelection &&
                     !(nFrmType & FRMTYPE_COLSECT ) ) );
 
-            BOOL bTableVertical = bHasTable && rSh.IsTableVertical();
+            sal_Bool bTableVertical = bHasTable && rSh.IsTableVertical();
 
             if( ( (SID_RULER_BORDERS_VERTICAL == nWhich) &&
                     ((bHasTable && !bTableVertical)||
@@ -1291,7 +1302,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             else if ( bHasTable )
             {
                 SwTabCols aTabCols;
-                USHORT    nNum;
+                sal_uInt16    nNum;
                 if ( 0 != ( bSetTabColFromDoc = IsTabColFromDoc() ) )
                 {
                     rSh.GetMouseTabCols( aTabCols, aTabColFromDocPos );
@@ -1307,47 +1318,47 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                 ASSERT(nNum <= aTabCols.Count(), "TabCol not found");
                 const int nLft = aTabCols.GetLeftMin() + aTabCols.GetLeft();
-                const int nRgt = (USHORT)(bTableVertical ? nPageHeight : nPageWidth) -
+                const int nRgt = (sal_uInt16)(bTableVertical ? nPageHeight : nPageWidth) -
                                   (aTabCols.GetLeftMin() +
                                   aTabCols.GetRight());
 
-                const USHORT nL = static_cast< USHORT >(nLft > 0 ? nLft : 0);
-                const USHORT nR = static_cast< USHORT >(nRgt > 0 ? nRgt : 0);
+                const sal_uInt16 nL = static_cast< sal_uInt16 >(nLft > 0 ? nLft : 0);
+                const sal_uInt16 nR = static_cast< sal_uInt16 >(nRgt > 0 ? nRgt : 0);
 
                 SvxColumnItem aColItem(nNum, nL, nR);
 
-                USHORT nStart = 0,
+                sal_uInt16 nStart = 0,
                        nEnd;
 
                 //columns in right-to-left tables need to be mirrored
-                BOOL bIsTableRTL =
+                sal_Bool bIsTableRTL =
                     IsTabColFromDoc() ?
                           rSh.IsMouseTableRightToLeft(aTabColFromDocPos)
                         : rSh.IsTableRightToLeft();
                 if(bIsTableRTL)
                 {
-                    for ( USHORT i = aTabCols.Count(); i ; --i )
+                    for ( sal_uInt16 i = aTabCols.Count(); i ; --i )
                     {
                         const SwTabColsEntry& rEntry = aTabCols.GetEntry( i - 1 );
-                        nEnd  = (USHORT)aTabCols.GetRight();
-                        nEnd  = nEnd - (USHORT)rEntry.nPos;
+                        nEnd  = (sal_uInt16)aTabCols.GetRight();
+                        nEnd  = nEnd - (sal_uInt16)rEntry.nPos;
                         SvxColumnDescription aColDesc( nStart, nEnd,
-                                    (USHORT(aTabCols.GetRight() - rEntry.nMax)),
-                                    (USHORT(aTabCols.GetRight() - rEntry.nMin)),
+                                    (sal_uInt16(aTabCols.GetRight() - rEntry.nMax)),
+                                    (sal_uInt16(aTabCols.GetRight() - rEntry.nMin)),
                                                     !aTabCols.IsHidden(i - 1) );
                         aColItem.Append(aColDesc);
                         nStart = nEnd;
                     }
                     SvxColumnDescription aColDesc(nStart,
-                                    aTabCols.GetRight() - aTabCols.GetLeft(), TRUE);
+                                    aTabCols.GetRight() - aTabCols.GetLeft(), sal_True);
                     aColItem.Append(aColDesc);
                 }
                 else
                 {
-                    for ( USHORT i = 0; i < aTabCols.Count(); ++i )
+                    for ( sal_uInt16 i = 0; i < aTabCols.Count(); ++i )
                     {
                         const SwTabColsEntry& rEntry = aTabCols.GetEntry( i );
-                        nEnd  = static_cast< USHORT >(rEntry.nPos - aTabCols.GetLeft());
+                        nEnd  = static_cast< sal_uInt16 >(rEntry.nPos - aTabCols.GetLeft());
                         SvxColumnDescription aColDesc( nStart, nEnd,
                                 rEntry.nMin - aTabCols.GetLeft(), rEntry.nMax - aTabCols.GetLeft(),
                                                     !aTabCols.IsHidden(i) );
@@ -1356,7 +1367,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     }
                     SvxColumnDescription aColDesc(nStart, aTabCols.GetRight() - aTabCols.GetLeft(),
                                 0, 0,
-                                    TRUE);
+                                    sal_True);
                     aColItem.Append(aColDesc);
                 }
                 rSet.Put(aColItem, nWhich);
@@ -1364,7 +1375,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             else if ( bFrmSelection || nFrmType & ( FRMTYPE_COLUMN | FRMTYPE_COLSECT ) )
             {
                 // Aus Rahmen oder Seite ?
-                USHORT nNum = 0;
+                sal_uInt16 nNum = 0;
                 if(bFrmSelection)
                 {
                     const SwFrmFmt* pFmt = rSh.GetFlyFrmFmt();
@@ -1379,7 +1390,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     !bFrmSelection &&
                      nFrmType & FRMTYPE_COLSECT )
                 {
-                    const SwSection *pSect = rSh.GetAnySection(FALSE, pPt);
+                    const SwSection *pSect = rSh.GetAnySection(sal_False, pPt);
                     ASSERT( pSect, "Welcher Bereich?");
                     if( pSect )
                     {
@@ -1393,14 +1404,14 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         SwRect aRect = rSh.GetAnyCurRect(RECT_SECTION_PRT, pPt);
                         const SwRect aTmpRect = rSh.GetAnyCurRect(RECT_SECTION, pPt);
 
-                        ::lcl_FillSvxColumn(rCol, USHORT(bVerticalWriting ? aRect.Height() : aRect.Width()), aColItem, 0);
+                        ::lcl_FillSvxColumn(rCol, sal_uInt16(bVerticalWriting ? aRect.Height() : aRect.Width()), aColItem, 0);
 
                         if(bVerticalWriting)
                         {
                             aRect.Pos() += Point(aTmpRect.Left(), aTmpRect.Top());
                             aRect.Pos().Y() -= rPageRect.Top();
-                            aColItem.SetLeft ((USHORT)(aRect.Top()));
-                            aColItem.SetRight((USHORT)(nPageHeight   - aRect.Bottom() ));
+                            aColItem.SetLeft ((sal_uInt16)(aRect.Top()));
+                            aColItem.SetRight((sal_uInt16)(nPageHeight   - aRect.Bottom() ));
                         }
                         else
                         {
@@ -1408,8 +1419,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                             // PAGES01
                             // make relative to page position:
-                            aColItem.SetLeft ((USHORT)( aRect.Left() - rPageRect.Left() ));
-                            aColItem.SetRight((USHORT)( rPageRect.Right() - aRect.Right()));
+                            aColItem.SetLeft ((sal_uInt16)( aRect.Left() - rPageRect.Left() ));
+                            aColItem.SetRight((sal_uInt16)( rPageRect.Right() - aRect.Right()));
                         }
                         aColItem.SetOrtho(aColItem.CalcOrtho());
 
@@ -1431,24 +1442,24 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         SvxColumnItem aColItem(nNum);
                         const SwRect &rSizeRect = rSh.GetAnyCurRect(RECT_FLY_PRT_EMBEDDED, pPt);
 
-                        BOOL bUseVertical = bFrameHasVerticalColumns || (!bFrmSelection && bVerticalWriting);
+                        sal_Bool bUseVertical = bFrameHasVerticalColumns || (!bFrmSelection && bVerticalWriting);
                         const long lWidth = bUseVertical ? rSizeRect.Height() : rSizeRect.Width();
                         const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED, pPt);
                         long nDist2 = ((bUseVertical ? rRect.Height() : rRect.Width()) - lWidth) /2;
-                        ::lcl_FillSvxColumn(rCol, USHORT(lWidth), aColItem, nDist2);
+                        ::lcl_FillSvxColumn(rCol, sal_uInt16(lWidth), aColItem, nDist2);
 
                         SfxItemSet aFrameSet(GetPool(), RES_LR_SPACE, RES_LR_SPACE);
                         rSh.GetFlyFrmAttr( aFrameSet );
 
                         if(bUseVertical)
                         {
-                            aColItem.SetLeft ((USHORT)(rRect.Top()- rPageRect.Top()));
-                            aColItem.SetRight((USHORT)(nPageHeight + rPageRect.Top() - rRect.Bottom() ));
+                            aColItem.SetLeft ((sal_uInt16)(rRect.Top()- rPageRect.Top()));
+                            aColItem.SetRight((sal_uInt16)(nPageHeight + rPageRect.Top() - rRect.Bottom() ));
                         }
                         else
                         {
-                            aColItem.SetLeft ((USHORT)(rRect.Left() - rPageRect.Left()   ));
-                            aColItem.SetRight((USHORT)(rPageRect.Right() - rRect.Right() ));
+                            aColItem.SetLeft ((sal_uInt16)(rRect.Left() - rPageRect.Left()   ));
+                            aColItem.SetRight((sal_uInt16)(rPageRect.Right() - rRect.Right() ));
                         }
 
                         aColItem.SetOrtho(aColItem.CalcOrtho());
@@ -1472,13 +1483,13 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     const SvxBoxItem& rBox = (const SvxBoxItem&)rMaster.GetFmtAttr(RES_BOX);
                     long nDist = rBox.GetDistance();
                     ::lcl_FillSvxColumn(aCol,
-                        USHORT(bVerticalWriting ? aPrtRect.Height() : aPrtRect.Width() ),
+                        sal_uInt16(bVerticalWriting ? aPrtRect.Height() : aPrtRect.Width() ),
                         aColItem, nDist);
 
                     if(bBrowse)
                     {
-                        aColItem.SetLeft((USHORT)rPagePrtRect.Left());
-                        aColItem.SetRight(USHORT(nPageWidth - rPagePrtRect.Right()));
+                        aColItem.SetLeft((sal_uInt16)rPagePrtRect.Left());
+                        aColItem.SetRight(sal_uInt16(nPageWidth - rPagePrtRect.Right()));
                     }
                     else
                     {
@@ -1497,8 +1508,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         case SID_RULER_ROWS :
         case SID_RULER_ROWS_VERTICAL:
         {
-            BOOL bFrameRTL;
-            BOOL bFrameHasVerticalColumns =  rSh.IsFrmVertical(FALSE, bFrameRTL) && bFrmSelection;
+            sal_Bool bFrameRTL;
+            sal_Bool bFrameHasVerticalColumns =  rSh.IsFrmVertical(sal_False, bFrameRTL) && bFrmSelection;
 
             if( ( (SID_RULER_ROWS == nWhich) &&
                     ((!bVerticalWriting && !bFrmSelection) || (bFrmSelection && !bFrameHasVerticalColumns)) ) ||
@@ -1511,7 +1522,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             {
                 SwTabCols aTabCols;
                 //no current value necessary
-                USHORT    nNum = 0;
+                sal_uInt16    nNum = 0;
                 if ( 0 != ( bSetTabRowFromDoc = IsTabRowFromDoc() ) )
                 {
                     rSh.GetMouseTabRows( aTabCols, aTabColFromDocPos );
@@ -1523,24 +1534,24 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
 //                ASSERT(nNum <= aTabCols.Count(), "TabCol not found");
                 const int nLft = aTabCols.GetLeftMin();
-                const int nRgt = (USHORT)(bVerticalWriting ? nPageWidth : nPageHeight) -
+                const int nRgt = (sal_uInt16)(bVerticalWriting ? nPageWidth : nPageHeight) -
                                   (aTabCols.GetLeftMin() +
                                   aTabCols.GetRight());
 
-                const USHORT nL = static_cast< USHORT >(nLft > 0 ? nLft : 0);
-                const USHORT nR = static_cast< USHORT >(nRgt > 0 ? nRgt : 0);
+                const sal_uInt16 nL = static_cast< sal_uInt16 >(nLft > 0 ? nLft : 0);
+                const sal_uInt16 nR = static_cast< sal_uInt16 >(nRgt > 0 ? nRgt : 0);
 
                 SvxColumnItem aColItem(nNum, nL, nR);
 
-                USHORT nStart = 0,
+                sal_uInt16 nStart = 0,
                        nEnd;
 
-                for ( USHORT i = 0; i < aTabCols.Count(); ++i )
+                for ( sal_uInt16 i = 0; i < aTabCols.Count(); ++i )
                 {
                     const SwTabColsEntry& rEntry = aTabCols.GetEntry( i );
                     if(bVerticalWriting)
                     {
-                        nEnd  = USHORT(aTabCols.GetRight() - rEntry.nPos);
+                        nEnd  = sal_uInt16(aTabCols.GetRight() - rEntry.nPos);
                         SvxColumnDescription aColDesc( nStart, nEnd,
                             aTabCols.GetRight() - rEntry.nMax, aTabCols.GetRight() - rEntry.nMin,
                                                     !aTabCols.IsHidden(i) );
@@ -1548,18 +1559,18 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     }
                     else
                     {
-                        nEnd  = USHORT(rEntry.nPos - aTabCols.GetLeft());
+                        nEnd  = sal_uInt16(rEntry.nPos - aTabCols.GetLeft());
                         SvxColumnDescription aColDesc( nStart, nEnd,
-                                USHORT(rEntry.nMin - aTabCols.GetLeft()), USHORT(rEntry.nMax - aTabCols.GetLeft()),
+                                sal_uInt16(rEntry.nMin - aTabCols.GetLeft()), sal_uInt16(rEntry.nMax - aTabCols.GetLeft()),
                                                     !aTabCols.IsHidden(i) );
                         aColItem.Append(aColDesc);
                     }
                     nStart = nEnd;
                 }
                 if(bVerticalWriting)
-                    nEnd = static_cast< USHORT >(aTabCols.GetRight());
+                    nEnd = static_cast< sal_uInt16 >(aTabCols.GetRight());
                 else
-                    nEnd = static_cast< USHORT >(aTabCols.GetLeft());
+                    nEnd = static_cast< sal_uInt16 >(aTabCols.GetLeft());
                 // put a position protection when the last row cannot be moved
                 // due to a page break inside of a row
                 if(!aTabCols.IsLastRowAllowedToChange())
@@ -1567,7 +1578,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                 SvxColumnDescription aColDesc( nStart, nEnd,
                     aTabCols.GetRight(), aTabCols.GetRight(),
-                                            FALSE );
+                                            sal_False );
                 aColItem.Append(aColDesc);
 
                 rSet.Put(aColItem, nWhich);
@@ -1593,15 +1604,15 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             {
                 if( nFrmType & FRMTYPE_TABLE )
                 {
-                    const USHORT nNum = rSh.GetCurTabColNum();
+                    const sal_uInt16 nNum = rSh.GetCurTabColNum();
                     SwTabCols aTabCols;
                     rSh.GetTabCols( aTabCols );
 
                     const int nLft = aTabCols.GetLeftMin() + aTabCols.GetLeft();
-                    const int nRgt = (USHORT)nPageWidth -(aTabCols.GetLeftMin() + aTabCols.GetRight());
+                    const int nRgt = (sal_uInt16)nPageWidth -(aTabCols.GetLeftMin() + aTabCols.GetRight());
 
-                    const USHORT nL = static_cast< USHORT >(nLft > 0 ? nLft : 0);
-                    const USHORT nR = static_cast< USHORT >(nRgt > 0 ? nRgt : 0);
+                    const sal_uInt16 nL = static_cast< sal_uInt16 >(nLft > 0 ? nLft : 0);
+                    const sal_uInt16 nR = static_cast< sal_uInt16 >(nRgt > 0 ? nRgt : 0);
 
                     aRectangle.Left() = nL;
                     if(nNum > 1)
@@ -1622,8 +1633,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     const SwFmtCol* pCols = pFmt ? &pFmt->GetCol():
                                                    &rDesc.GetMaster().GetCol();
                     const SwColumns& rCols = pCols->GetColumns();
-                    USHORT nNum = rSh.GetCurOutColNum();
-                    USHORT nCount = Min(USHORT(nNum + 1), rCols.Count());
+                    sal_uInt16 nNum = rSh.GetCurOutColNum();
+                    sal_uInt16 nCount = Min(sal_uInt16(nNum + 1), rCols.Count());
                     const SwRect aRect( rSh.GetAnyCurRect( pFmt
                                                     ? RECT_FLY_PRT_EMBEDDED
                                                     : RECT_PAGE_PRT, pPt ));
@@ -1632,14 +1643,14 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                                     : RECT_PAGE, pPt ));
 
                     //die Breite im Rahmen bzw. innerhalbe der Seitenraender
-                    const USHORT nTotalWidth = (USHORT)aRect.Width();
+                    const sal_uInt16 nTotalWidth = (sal_uInt16)aRect.Width();
                     //die gesamte Rahmenbreite - die Differenz ist der doppelte Abstand zum Rand
-                    const USHORT nOuterWidth = (USHORT)aAbsRect.Width();
+                    const sal_uInt16 nOuterWidth = (sal_uInt16)aAbsRect.Width();
                     int nWidth = 0,
                         nStart = 0,
                         nEnd = 0;
                     aRectangle.Left() = 0;
-                    for ( USHORT i = 0; i < nCount; ++i )
+                    for ( sal_uInt16 i = 0; i < nCount; ++i )
                     {
                         SwColumn* pCol = rCols[i];
                         nStart = pCol->GetLeft() + nWidth;
@@ -1681,13 +1692,13 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             else if ( ((nFrmType & FRMTYPE_TABLE) || IsTabColFromDoc()) &&
                  !bFrmSelection )
             {
-                BOOL bColumn;
+                sal_Bool bColumn;
                 if ( IsTabColFromDoc() )
                     bColumn = rSh.GetCurMouseColNum( aTabColFromDocPos ) != 0;
                 else
                     bColumn = (nFrmType & (FRMTYPE_COLUMN|FRMTYPE_FLY_ANY|
                                             FRMTYPE_COLSECTOUTTAB)) ?
-                                            TRUE : FALSE;
+                                            sal_True : sal_False;
                 if ( !bColumn )
                 {
                     if( nFrmType & FRMTYPE_FLY_ANY && IsTabColFromDoc() )
@@ -1713,16 +1724,16 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 }
                 else
                 {   //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen
-                    BOOL bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? TRUE : FALSE;
-                    BOOL bFrame = (nFrmType & FRMTYPE_FLY_ANY) ? TRUE : FALSE;
-                    BOOL bColSct =  (nFrmType & ( bSectOutTbl
+                    sal_Bool bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? sal_True : sal_False;
+                    sal_Bool bFrame = (nFrmType & FRMTYPE_FLY_ANY) ? sal_True : sal_False;
+                    sal_Bool bColSct =  (nFrmType & ( bSectOutTbl
                                                     ? FRMTYPE_COLSECTOUTTAB
                                                     : FRMTYPE_COLSECT )
-                                                ) ? TRUE : FALSE;
+                                                ) ? sal_True : sal_False;
                     //Damit man auch mit der Mouse ziehen kann,
                     //ohne in der Tabelle zu stehen
                     CurRectType eRecType = RECT_PAGE_PRT;
-                    USHORT nNum = IsTabColFromDoc() ?
+                    sal_uInt16 nNum = IsTabColFromDoc() ?
                                 rSh.GetCurMouseColNum( aTabColFromDocPos ):
                                 rSh.GetCurOutColNum();
                     const SwFrmFmt* pFmt = NULL;
@@ -1743,7 +1754,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     const SwFmtCol* pCols = pFmt ? &pFmt->GetCol():
                                                    &rDesc.GetMaster().GetCol();
                     const SwColumns& rCols = pCols->GetColumns();
-                    const USHORT nBorder = pFmt ? pFmt->GetBox().GetDistance() :
+                    const sal_uInt16 nBorder = pFmt ? pFmt->GetBox().GetDistance() :
                                                   rDesc.GetMaster().GetBox().GetDistance();
 
                     /* RECT_FLY_PRT_EMBEDDED returns the relative position to
@@ -1755,7 +1766,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         aRect.Pos() += rSh.GetAnyCurRect( RECT_FLY_EMBEDDED,
                                                                 pPt ).Pos();
 
-                    const USHORT nTotalWidth = (USHORT)aRect.Width();
+                    const sal_uInt16 nTotalWidth = (sal_uInt16)aRect.Width();
                     //nStart und nEnd initialisieren fuer nNum == 0
                     int nWidth = 0,
                         nStart = 0,
@@ -1767,7 +1778,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         nNum = rCols.Count();
                     }
 
-                    for( USHORT i = 0; i < nNum; ++i )
+                    for( sal_uInt16 i = 0; i < nNum; ++i )
                     {
                         SwColumn* pCol = rCols[i];
                         nStart = pCol->GetLeft() + nWidth;
@@ -1813,7 +1824,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         {
             if(bFrmSelection)
             {
-                BYTE nProtect = pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT );
+                sal_uInt8 nProtect = pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT );
 
                 SvxProtectItem aProt(SID_RULER_PROTECT);
                 aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT)   != 0);
@@ -1826,8 +1837,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 SvxProtectItem aProtect(SID_RULER_PROTECT);
                 if(bBrowse && !(nFrmType & (FRMTYPE_DRAWOBJ|FRMTYPE_COLUMN)) && !rSh.GetTableFmt())
                 {
-                    aProtect.SetSizeProtect(TRUE);
-                    aProtect.SetPosProtect(TRUE);
+                    aProtect.SetSizeProtect(sal_True);
+                    aProtect.SetPosProtect(sal_True);
                 }
                 rSet.Put(aProtect);
             }
@@ -1839,7 +1850,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
     if(bPutContentProtection)
     {
         SvxProtectItem aProtect(SID_RULER_PROTECT);
-        aProtect.SetCntntProtect(TRUE);
+        aProtect.SetCntntProtect(sal_True);
         rSet.Put(aProtect);
     }
 }