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

[Jan Holesovsky]

 sw/source/filter/ww8/wrtw8esh.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 247d080b366083b3ee4054675b70af2ccbbb34bf
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Tue May 12 15:42:14 2015 +0200

    sw: Another rename.
    
    Change-Id: I3d7bf8a5db4dcae4b5653fe5e033bc9e626b7bbf

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 4fec434..10f2559 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -929,13 +929,13 @@ bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, 
const sw::Frame& rFmt,
     const Point& rNdTopLeft )
 {
     bool bRet = false;
-    const SwFrmFmt &rFormat = rFmt.GetFrmFmt();
+    const SwFrmFmt &rFrameFormat = rFmt.GetFrmFmt();
     if (TXT_HDFT == rWrt.m_nTxtTyp || TXT_MAINTEXT == rWrt.m_nTxtTyp)
     {
-        if (RES_FLYFRMFMT == rFormat.Which())
+        if (RES_FLYFRMFMT == rFrameFormat.Which())
         {
             // check for textflyframe and if it is the first in a Chain
-            if (rFormat.GetCntnt().GetCntntIdx())
+            if (rFrameFormat.GetCntnt().GetCntntIdx())
                 bRet = true;
         }
         else
@@ -944,7 +944,7 @@ bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const 
sw::Frame& rFmt,
 
     if (bRet)
     {
-        DrawObj aObj(rFmt, nCp, rNdTopLeft, rWrt.TrueFrameDirection(rFormat),
+        DrawObj aObj(rFmt, nCp, rNdTopLeft, 
rWrt.TrueFrameDirection(rFrameFormat),
             rWrt.GetHdFtIndex());
         maDrawObjs.push_back(aObj);
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits