[Libreoffice-commits] core.git: sw/source

[Chris Laplante]

 sw/source/filter/ww8/wrtw8nds.cxx |   27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

New commits:
commit a74f0cd6a7dad15982bcdbc048cc2712ed8b976d
Author: Chris Laplante <mostthingsweb at gmail.com>
Date:   Wed Apr 9 19:55:35 2014 -0400

    Simplify the AttributeOutputBase::OutputFlyFrame method.
    
    Change-Id: Iac3b1b627728d5268ce7633904af9113e3127be2
    Reviewed-on: https://gerrit.libreoffice.org/9006
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 523a9ec..5024333 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2885,32 +2885,15 @@ void AttributeOutputBase::OutputFlyFrame( const sw::Frame& rFmt )
         return;
 
     const SwCntntNode &rNode = *rFmt.GetCntntNode();
-    Point aNdPos, aPgPos;
-    Point* pLayPos;
-    bool bValidNdPos = false, bValidPgPos = false;
+    Point aLayPos;
 
+    // get the Layout Node-Position
     if (FLY_AT_PAGE == rFmt.GetFrmFmt().GetAnchor().GetAnchorId())
-    {
-        // get the Layout Node-Position.
-        if ( !bValidPgPos )
-        {
-            aPgPos = rNode.FindPageFrmRect(false, &aPgPos).Pos();
-            bValidPgPos = true;
-        }
-        pLayPos = &aPgPos;
-    }
+        aLayPos = rNode.FindPageFrmRect().Pos();
     else
-    {
-        // get the Layout Node-Position.
-        if ( !bValidNdPos )
-        {
-            aNdPos = rNode.FindLayoutRect(false, &aNdPos).Pos();
-            bValidNdPos = true;
-        }
-        pLayPos = &aNdPos;
-    }
+        aLayPos = rNode.FindLayoutRect().Pos();
 
-    OutputFlyFrame_Impl( rFmt, *pLayPos );
+    OutputFlyFrame_Impl( rFmt, aLayPos );
 }
 
 // write data of any redline