Fix #65244#: Right and left pages, virtual page numbering

4 files changed, 13 insertions, 12 deletions

diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 4f0c3e600e2b..b8b093b648f6 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dflyobj.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2000-11-25 18:59:54 $
+ *  last change: $Author: ama $ $Date: 2001-03-02 10:12:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -491,7 +491,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
         long lXDiff = aNewPos.X() - aOldPos.X();
         if( rHori.IsPosToggle() && HORI_NONE == eHori &&
-            !(GetFlyFrm()->FindPageFrm()->GetVirtPageNum() % 2) )
+            !GetFlyFrm()->FindPageFrm()->OnRightPage() )
             lXDiff = -lXDiff;
         const long lYDiff = aNewPos.Y() - aOldPos.Y();
         const Point aTmp( rHori.GetPos() + lXDiff,
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index d119a364586c..c09e4f473acd 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.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-01 12:34:58 $
+ *  last change: $Author: ama $ $Date: 2001-03-02 10:17:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -845,7 +845,7 @@ void SwFEShell::CalcBoundRect( SwRect &rRect, RndStdIds nAnchorId,
         pFrm = pFly ? pFly->GetAnchor() : GetCurrFrm();
     }
     SwPageFrm* pPage = pFrm->FindPageFrm();
-    bMirror = bMirror && !( pPage->GetVirtPageNum() % 2 );
+    bMirror = bMirror && !pPage->OnRightPage();
 
     Point aPos;
     if( FLY_PAGE == nAnchorId || FLY_AT_FLY == nAnchorId ) // LAYER_IMPL
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index a5b8cbf6caf6..86a3ffe286f2 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ndgrf.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jp $ $Date: 2001-02-26 15:34:21 $
+ *  last change: $Author: ama $ $Date: 2001-03-02 10:13:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1126,8 +1126,7 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
 
     const SwMirrorGrf & rMirror = rSet.GetMirrorGrf();
     ULONG nMirror = BMP_MIRROR_NONE;
-    if( rMirror.IsGrfToggle() && pFrm &&
-        !(pFrm->FindPageFrm()->GetVirtPageNum() % 2 ) )
+    if( rMirror.IsGrfToggle() && pFrm && !pFrm->FindPageFrm()->OnRightPage() )
     {
         switch( rMirror.GetValue() )
         {
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 74b9d197d973..4791c15d1065 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frame.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:20 $
+ *  last change: $Author: ama $ $Date: 2001-03-02 10:10:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -492,6 +492,8 @@ public:
 
     USHORT GetPhyPageNum() const;   //Seitennummer ohne Offset
     USHORT GetVirtPageNum() const;  //Seitenummer mit Offset
+    BOOL OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
+    BOOL WannaRightPage() const;
 
     const  SwLayoutFrm *GetPrevLayoutLeaf() const;
     const  SwLayoutFrm *GetNextLayoutLeaf() const;