1 files changed, 35 insertions, 29 deletions

diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index e5c52869f641..a045a2e80635 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -56,7 +56,7 @@
 
 using namespace ::com::sun::star;
 
-static USHORT aFrmMgrRange[] = {
+static sal_uInt16 aFrmMgrRange[] = {
                             RES_FRMATR_BEGIN, RES_FRMATR_END-1,
                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                             FN_SET_FRM_NAME, FN_SET_FRM_NAME,
@@ -65,17 +65,18 @@ static USHORT aFrmMgrRange[] = {
 /*--------------------------------------------------------------------
      Beschreibung: Rahmen-Attribute ueber Shell ermitteln
  --------------------------------------------------------------------*/
-SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) :
+SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType ) :
     aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ),
     pOwnSh( pSh ),
-    bAbsPos( FALSE ),
+    bAbsPos( sal_False ),
     bNewFrm( bNew ),
-    bIsInVertical( FALSE )
+    bIsInVertical( sal_False ),
+    bIsInVerticalL2R( sal_False )
 {
     if ( bNewFrm )
     {
         // Defaults einstellen:
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
         switch ( nType )
         {
             case FRMMGR_TYPE_TEXT:  nId = RES_POOLFRM_FRAME;    break;
@@ -90,23 +91,24 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) :
     else if ( nType == FRMMGR_TYPE_NONE )
     {
         pOwnSh->GetFlyFrmAttr( aSet );
-        BOOL bRightToLeft;
-        bIsInVertical = pOwnSh->IsFrmVertical(TRUE, bRightToLeft);
+        sal_Bool bRightToLeft;
+        bIsInVertical = pOwnSh->IsFrmVertical(sal_True, bRightToLeft, bIsInVerticalL2R);
     }
     ::PrepareBoxInfo( aSet, *pOwnSh );
 }
 
-SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, const SfxItemSet &rSet ) :
+SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, const SfxItemSet &rSet ) :
     aSet( rSet ),
     pOwnSh( pSh ),
-    bAbsPos( FALSE ),
+    bAbsPos( sal_False ),
     bNewFrm( bNew ),
-    bIsInVertical(FALSE)
+    bIsInVertical(sal_False),
+    bIsInVerticalL2R(sal_False)
 {
     if(!bNew)
     {
-        BOOL bRightToLeft;
-        bIsInVertical = pSh->IsFrmVertical(TRUE, bRightToLeft);
+        sal_Bool bRightToLeft;
+        bIsInVertical = pSh->IsFrmVertical(sal_True, bRightToLeft, bIsInVerticalL2R);
     }
 }
 
@@ -124,7 +126,7 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm()
 {
     const SfxPoolItem* pItem = 0;
 
-    if (aSet.GetItemState(FN_SET_FRM_NAME, FALSE, &pItem) == SFX_ITEM_SET)
+    if (aSet.GetItemState(FN_SET_FRM_NAME, sal_False, &pItem) == SFX_ITEM_SET)
         pOwnSh->SetFlyName(((SfxStringItem *)pItem)->GetValue());
 
     pOwnSh->SetModified();
@@ -132,7 +134,7 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm()
     if ( bAbsPos )
     {
         pOwnSh->SetFlyPos( aAbsPos );
-        bAbsPos = FALSE;
+        bAbsPos = sal_False;
     }
 }
 
@@ -148,11 +150,11 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
     {
         //JP 6.8.2001: set never an invalid anchor into the core.
         const SfxPoolItem *pGItem, *pItem;
-        if( SFX_ITEM_SET == aSet.GetItemState( RES_ANCHOR, FALSE, &pItem ))
+        if( SFX_ITEM_SET == aSet.GetItemState( RES_ANCHOR, sal_False, &pItem ))
         {
             SfxItemSet aGetSet( *aSet.GetPool(), RES_ANCHOR, RES_ANCHOR );
             if( pOwnSh->GetFlyFrmAttr( aGetSet ) && 1 == aGetSet.Count() &&
-                SFX_ITEM_SET == aGetSet.GetItemState( RES_ANCHOR, FALSE, &pGItem )
+                SFX_ITEM_SET == aGetSet.GetItemState( RES_ANCHOR, sal_False, &pGItem )
                 && ((SwFmtAnchor*)pGItem)->GetAnchorId() ==
                    ((SwFmtAnchor*)pItem)->GetAnchorId() )
                 aSet.ClearItem( RES_ANCHOR );
@@ -172,11 +174,11 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
 /*--------------------------------------------------------------------
      Beschreibung:  Rahmen einfuegen
  --------------------------------------------------------------------*/
-BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
+sal_Bool SwFlyFrmAttrMgr::InsertFlyFrm()
 {
     pOwnSh->StartAllAction();
 
-    BOOL bRet = 0 != pOwnSh->NewFlyFrm( aSet );
+    sal_Bool bRet = 0 != pOwnSh->NewFlyFrm( aSet );
 
     // richtigen Mode an der Shell einschalten, Rahmen wurde aut. selektiert.
     if ( bRet )
@@ -198,7 +200,7 @@ BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
 void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds    eAnchorType,
                                    const Point  &rPos,
                                    const Size   &rSize,
-                                   BOOL bAbs )
+                                   sal_Bool bAbs )
 {
     OSL_ENSURE( eAnchorType == FLY_AT_PAGE ||
             eAnchorType == FLY_AT_PARA ||
@@ -221,7 +223,7 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds    eAnchorType,
  --------------------------------------------------------------------*/
 void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
 {
-    USHORT nPhyPageNum, nVirtPageNum;
+    sal_uInt16 nPhyPageNum, nVirtPageNum;
     pOwnSh->GetPageNum( nPhyPageNum, nVirtPageNum );
 
     aSet.Put( SwFmtAnchor( eId, nPhyPageNum ) );
@@ -250,7 +252,7 @@ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
  --------------------------------------------------------------------*/
 void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
 {
-    bAbsPos = TRUE;
+    bAbsPos = sal_True;
     aAbsPos = rPoint;
 
     SwFmtVertOrient aVertOrient( GetVertOrient() );
@@ -266,7 +268,7 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
  --------------------------------------------------------------------*/
 void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
         const SwPosition* pToCharCntntPos,
-        BOOL bOnlyPercentRefValue )
+        sal_Bool bOnlyPercentRefValue )
 {
     if (!bOnlyPercentRefValue)
     {
@@ -289,7 +291,9 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
     if (bOnlyPercentRefValue)
         return;
 
-    if(bIsInVertical)
+    // --> OD 2009-09-01 #mongolianlayout#
+    if ( bIsInVertical || bIsInVerticalL2R )
+    // <--
     {
         Point aPos(aBoundRect.Pos());
         long nTmp = aPos.X();
@@ -486,7 +490,9 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
             rVal.nMaxVPos = -aBoundRect.Height();
         }
     }
-    if(bIsInVertical)
+    // --> OD 2009-09-01 #mongolianlayout#
+    if ( bIsInVertical || bIsInVerticalL2R )
+    // <--
     {
         //restore width/height exchange
         long nTmp = rVal.nWidth;
@@ -534,7 +540,7 @@ SwTwips SwFlyFrmAttrMgr::CalcRightSpace()
 /*--------------------------------------------------------------------
     Beschreibung: Attribut aus dem Set loeschen
  --------------------------------------------------------------------*/
-void SwFlyFrmAttrMgr::DelAttr( USHORT nId )
+void SwFlyFrmAttrMgr::DelAttr( sal_uInt16 nId )
 {
     aSet.ClearItem( nId );
 }
@@ -545,9 +551,9 @@ void SwFlyFrmAttrMgr::SetLRSpace( long nLeft, long nRight )
 
     SvxLRSpaceItem aTmp( (SvxLRSpaceItem&)aSet.Get( RES_LR_SPACE ) );
     if( LONG_MAX != nLeft )
-        aTmp.SetLeft( USHORT(nLeft) );
+        aTmp.SetLeft( sal_uInt16(nLeft) );
     if( LONG_MAX != nRight )
-        aTmp.SetRight( USHORT(nRight) );
+        aTmp.SetRight( sal_uInt16(nRight) );
     aSet.Put( aTmp );
 }
 
@@ -557,9 +563,9 @@ void SwFlyFrmAttrMgr::SetULSpace( long nTop, long nBottom )
 
     SvxULSpaceItem aTmp( (SvxULSpaceItem&)aSet.Get( RES_UL_SPACE ) );
     if( LONG_MAX != nTop )
-        aTmp.SetUpper( USHORT(nTop) );
+        aTmp.SetUpper( sal_uInt16(nTop) );
     if( LONG_MAX != nBottom )
-        aTmp.SetLower( USHORT(nBottom) );
+        aTmp.SetLower( sal_uInt16(nBottom) );
     aSet.Put( aTmp );
 }