#98399# change of position strings appended to reflect right-to-left text

4 files changed, 24 insertions, 20 deletions

diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index d322298d3f02..7142311f9e92 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fews.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: os $ $Date: 2002-08-12 13:40:36 $
+ *  last change: $Author: os $ $Date: 2002-08-23 13:37:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1039,12 +1039,18 @@ Size SwFEShell::GetGraphicDefaultSize() const
 /* -----------------------------12.08.2002 12:51------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SwFEShell::IsFrmInVertical() const
+BOOL SwFEShell::IsFrmInVertical(BOOL& bRTL) const
 {
     SwFlyFrm *pFly = FindFlyFrm();
     BOOL bVert = FALSE;
     if ( pFly )
-        bVert = pFly->GetAnchor()->IsVertical();
+    {
+        const SwFrm *pFrm = pFly->GetAnchor();
+        bVert = pFrm->IsVertical();
+        bRTL = pFrm->IsRightToLeft();
+    }
+    else
+        bRTL = FALSE;
     return bVert;
 }
 
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index 40cd98d450d1..89f5c98ac139 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmmgr.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2002-08-12 13:43:08 $
+ *  last change: $Author: os $ $Date: 2002-08-23 13:37:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,7 +143,8 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) :
     else if ( nType == FRMMGR_TYPE_NONE )
     {
         pOwnSh->GetFlyFrmAttr( aSet );
-        bIsInVertical = pOwnSh->IsFrmInVertical();
+        BOOL bRightToLeft;
+        bIsInVertical = pOwnSh->IsFrmInVertical(bRightToLeft);
     }
     ::PrepareBoxInfo( aSet, *pOwnSh );
 }
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index 78ed52cb6d60..0963c50af32e 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmui.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: os $ $Date: 2002-08-22 10:07:25 $
+ *  last change: $Author: os $ $Date: 2002-08-23 13:35:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1549,13 +1549,9 @@ String STR_REL_FRM_BOTTOM
     TEXT = "Absatzrand unten" ;
     Text [ english_us ] = "Bottom paragraph border" ;
 };
-
-
-
-
-
-
-
-
-
+String STR_FROMRIGHT
+{
+    TEXT = "Von rechts" ;
+    TEXT [ english_us ] = "From right" ;
+};
 
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 05fa3f95bd62..6c3f9776601a 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmpage.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: os $ $Date: 2002-08-12 13:59:57 $
+ *  last change: $Author: os $ $Date: 2002-08-23 13:37:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -151,6 +151,7 @@ class SwFrmPage: public SfxTabPage
     BOOL            bNoModifyHdl;
     BOOL            bVerticalChanged;  //check done whether frame is in vertical environment
     BOOL            bIsVerticalFrame;  //current frame is in vertical environment - strings are exchanged
+    BOOL            bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
     USHORT          nHtmlMode;
     USHORT          nDlgType;
     Size            aGrfSize;