Module: wine Branch: master Commit: 0ba867743012bd324377c47aaa358bcdb86165c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba867743012bd324377c47aaa...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Wed Apr 23 22:13:07 2008 +0100
riched20: Remove unused variables.
---
dlls/riched20/editor.c | 3 --- dlls/riched20/paint.c | 3 +-- dlls/riched20/style.c | 3 +-- dlls/riched20/wrap.c | 4 +--- 4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9c4a013..c5a7554 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3531,7 +3531,6 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) int car_pos = 0; int text_pos=-1; int URLmin, URLmax = 0; - CHARRANGE url; FINDTEXTA ft; CHARFORMAT2W cur_format; CHARFORMAT2W default_format; @@ -3585,8 +3584,6 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) } if (text_pos != -1) { - url.cpMin=text_pos; - url.cpMax=car_pos-1; ME_SetCharFormat(editor, text_pos, (URLmax-text_pos), &link); ME_RewrapRepaint(editor); break; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e6ec8ce..ddd7de7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -479,7 +479,7 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { RECT rc, rcPara; int y = c->pt.y; int height = 0, baseline = 0, no=0, pno = 0; - int xs = 0, xe = 0; + int xe = 0; BOOL visible = FALSE; int nMargWidth = 0;
@@ -494,7 +494,6 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { nMargWidth = ME_twips2pointsX(c, para->pFmt->dxStartIndent); if (pno != 0) nMargWidth += ME_twips2pointsX(c, para->pFmt->dxOffset); - xs = c->rcView.left+nMargWidth; xe = c->rcView.right - ME_twips2pointsX(c, para->pFmt->dxRightIndent); y += ME_DrawParaDecoration(c, para, y); break; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0ec822e..b483be0 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -327,10 +327,9 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s)
void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) { - int rx, ry; + int ry;
ME_InitCharFormat2W(fmt); - rx = GetDeviceCaps(hDC, LOGPIXELSX); ry = GetDeviceCaps(hDC, LOGPIXELSY); lstrcpyW(fmt->szFaceName, lf->lfFaceName); fmt->dwEffects = 0; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a657b03..43d3d79 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -470,7 +470,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; - int yStart = -1, yEnd = -1; + int yStart = -1;
ME_InitContext(&c, editor, GetDC(editor->hWnd)); c.pt.x = 0; @@ -499,8 +499,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { bModified = bModified | bRedraw;
c.pt.y += item->member.para.nHeight; - if (bRedraw) - yEnd = c.pt.y; item = item->member.para.next_para; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left;