richedit: Removed redundant variable ptLastSplittableRun.
authorDylan Smith <dylan.ah.smith@gmail.com>
Thu, 29 Jul 2010 01:17:53 +0000 (21:17 -0400)
committerAlexandre Julliard <julliard@winehq.org>
Thu, 29 Jul 2010 08:28:06 +0000 (10:28 +0200)
dlls/riched20/editstr.h
dlls/riched20/wrap.c

index 9b8d645199e6f19ad1be71a0a71bfe3f0fc38625..c9c55dae76e932cb302ed707be78969d54a22037 100644 (file)
@@ -414,7 +414,6 @@ typedef struct tagME_WrapContext
   ME_DisplayItem *pRowStart;
 
   ME_DisplayItem *pLastSplittableRun;
-  POINT ptLastSplittableRun;
 } ME_WrapContext;
 
 #endif
index 8d75b7fbf97950c2cdaa8d984c8703819e476f2e..d2ebd94ff7cb7180a212e702e31a8a6681db07ec 100644 (file)
@@ -271,7 +271,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem
   {
     if (wc->pLastSplittableRun->member.run.nFlags & (MERF_GRAPHICS|MERF_TAB))
     {
-      wc->pt = wc->ptLastSplittableRun;
+      wc->pt = wc->pLastSplittableRun->member.run.pt;
       return wc->pLastSplittableRun;
     }
     else if (wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE)
@@ -299,7 +299,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem
     else
     {
       /* restart from the first run beginning with spaces */
-      wc->pt = wc->ptLastSplittableRun;
+      wc->pt = wc->pLastSplittableRun->member.run.pt;
       return wc->pLastSplittableRun;
     }
   }
@@ -451,7 +451,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
     || ((run->nFlags & (MERF_GRAPHICS|MERF_TAB)) && (p != wc->pRowStart)))
   {
     wc->pLastSplittableRun = p;
-    wc->ptLastSplittableRun = wc->pt;
   }
   wc->pt.x += run->nWidth;
   return p->next;