From 70e0c09fcffa5520d3cfdc4708c81248b135c796 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 1 Dec 2014 12:56:22 +0000 Subject: - more warning fixes; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@11191 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/mTextControl/src/fancy_rtf.cpp | 132 +++++++++++++++------------------ 1 file changed, 58 insertions(+), 74 deletions(-) (limited to 'plugins/mTextControl/src/fancy_rtf.cpp') diff --git a/plugins/mTextControl/src/fancy_rtf.cpp b/plugins/mTextControl/src/fancy_rtf.cpp index 01ad6bc0f3..e5325bd706 100644 --- a/plugins/mTextControl/src/fancy_rtf.cpp +++ b/plugins/mTextControl/src/fancy_rtf.cpp @@ -14,38 +14,37 @@ enum { BBS_BOLD_S, BBS_BOLD_E, BBS_ITALIC_S, BBS_ITALIC_E, BBS_UNDERLINE_S, BBS_ static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt, DWORD cookie) { - CHARFORMAT cf = {0}; + CHARFORMAT cf = { 0 }; cf.cbSize = sizeof(cf); - switch (cookie) - { - case BBS_BOLD_S: - cf.dwMask = CFM_BOLD; - cf.dwEffects = CFE_BOLD; - break; - case BBS_BOLD_E: - cf.dwMask = CFM_BOLD; - break; - case BBS_ITALIC_S: - cf.dwMask = CFM_ITALIC; - cf.dwEffects = CFE_ITALIC; - break; - case BBS_ITALIC_E: - cf.dwMask = CFM_ITALIC; - break; - case BBS_UNDERLINE_S: - cf.dwMask = CFM_UNDERLINE; - cf.dwEffects = CFE_UNDERLINE; - break; - case BBS_UNDERLINE_E: - cf.dwMask = CFM_UNDERLINE; - break; - case BBS_STRIKEOUT_S: - cf.dwMask = CFM_STRIKEOUT; - cf.dwEffects = CFE_STRIKEOUT; - break; - case BBS_STRIKEOUT_E: - cf.dwMask = CFM_STRIKEOUT; - break; + switch (cookie) { + case BBS_BOLD_S: + cf.dwMask = CFM_BOLD; + cf.dwEffects = CFE_BOLD; + break; + case BBS_BOLD_E: + cf.dwMask = CFM_BOLD; + break; + case BBS_ITALIC_S: + cf.dwMask = CFM_ITALIC; + cf.dwEffects = CFE_ITALIC; + break; + case BBS_ITALIC_E: + cf.dwMask = CFM_ITALIC; + break; + case BBS_UNDERLINE_S: + cf.dwMask = CFM_UNDERLINE; + cf.dwEffects = CFE_UNDERLINE; + break; + case BBS_UNDERLINE_E: + cf.dwMask = CFM_UNDERLINE; + break; + case BBS_STRIKEOUT_S: + cf.dwMask = CFM_STRIKEOUT; + cf.dwEffects = CFE_STRIKEOUT; + break; + case BBS_STRIKEOUT_E: + cf.dwMask = CFM_STRIKEOUT; + break; } ITextServices *ts = ftd->getTextService(); @@ -66,20 +65,11 @@ static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt long cnt; LRESULT lResult; -/* - TEXTRANGE trg; - trg.chrg = range; - trg.lpstrText = new TCHAR[trg.chrg.cpMax - trg.chrg.cpMin + 1]; - ts->TxSendMessage(EM_GETTEXTRANGE, 0, (LPARAM)&trg, &lResult); - MessageBox(0, txt, trg.lpstrText, MB_OK); -*/ ts->TxSendMessage(EM_SETSEL, range.cpMin, range.cpMax, &lResult); IRichEditOle* RichEditOle; ts->TxSendMessage(EM_GETOLEINTERFACE, 0, (LPARAM)&RichEditOle, &lResult); td->Freeze(&cnt); -// HDC emfdc = CreateEnhMetaFile(NULL, NULL, NULL, _T("icon")); -// DrawIconEx(emfdc, 0, 0, (HICON)_ttol(txt), 16, 16, 0, NULL, DI_NORMAL); -// InsertBitmap(RichEditOle, CloseEnhMetaFile(emfdc)); + #ifdef _WIN64 bool res = InsertBitmap(RichEditOle, CacheIconToEmf((HICON)_tstoi64(txt))); #else @@ -93,24 +83,24 @@ static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt static BBCodeInfo bbCodes[] = { - { _T("[b]"), 0, bbCodeSimpleFunc, BBS_BOLD_S }, - { _T("[/b]"), 0, bbCodeSimpleFunc, BBS_BOLD_E }, - { _T("[i]"), 0, bbCodeSimpleFunc, BBS_ITALIC_S }, - { _T("[/i]"), 0, bbCodeSimpleFunc, BBS_ITALIC_E }, - { _T("[u]"), 0, bbCodeSimpleFunc, BBS_UNDERLINE_S }, - { _T("[/u]"), 0, bbCodeSimpleFunc, BBS_UNDERLINE_E }, - { _T("[s]"), 0, bbCodeSimpleFunc, BBS_STRIKEOUT_S }, - { _T("[/s]"), 0, bbCodeSimpleFunc, BBS_STRIKEOUT_E }, - -// { _T("[color="), _T("]"), bbCodeSimpleFunc, BBS_COLOR_S }, -// { _T("[/color]"), 0, bbCodeSimpleFunc, BBS_COLOR_E } - - { _T("[$hicon="), _T("$]"), bbCodeImageFunc, 0 } - -// { _T("[url]"), _T("[/url]"), bbCodeSimpleFunc, BBS_URL1 }, -// { _T("[url="), _T("]"), bbCodeSimpleFunc, BBS_URL2 }, -// { _T("[url]"), _T("[/url]"), bbCodeSimpleFunc, BBS_IMG1 }, -// { _T("[url="), _T("]"), bbCodeSimpleFunc, BBS_IMG2 }, + { _T("[b]"), 0, bbCodeSimpleFunc, BBS_BOLD_S }, + { _T("[/b]"), 0, bbCodeSimpleFunc, BBS_BOLD_E }, + { _T("[i]"), 0, bbCodeSimpleFunc, BBS_ITALIC_S }, + { _T("[/i]"), 0, bbCodeSimpleFunc, BBS_ITALIC_E }, + { _T("[u]"), 0, bbCodeSimpleFunc, BBS_UNDERLINE_S }, + { _T("[/u]"), 0, bbCodeSimpleFunc, BBS_UNDERLINE_E }, + { _T("[s]"), 0, bbCodeSimpleFunc, BBS_STRIKEOUT_S }, + { _T("[/s]"), 0, bbCodeSimpleFunc, BBS_STRIKEOUT_E }, + + // { _T("[color="), _T("]"), bbCodeSimpleFunc, BBS_COLOR_S }, + // { _T("[/color]"), 0, bbCodeSimpleFunc, BBS_COLOR_E } + + { _T("[$hicon="), _T("$]"), bbCodeImageFunc, 0 } + + // { _T("[url]"), _T("[/url]"), bbCodeSimpleFunc, BBS_URL1 }, + // { _T("[url="), _T("]"), bbCodeSimpleFunc, BBS_URL2 }, + // { _T("[url]"), _T("[/url]"), bbCodeSimpleFunc, BBS_IMG1 }, + // { _T("[url="), _T("]"), bbCodeSimpleFunc, BBS_IMG2 }, }; static int bbCodeCount = sizeof(bbCodes) / sizeof(*bbCodes); @@ -120,15 +110,13 @@ void bbCodeParse(IFormattedTextDraw *ftd) LRESULT lResult; int pos = 0; - for (bool found = true; found; ) - { + for (bool found = true; found;) { found = false; CHARRANGE fRange; fRange.cpMin = -1; TCHAR *fText = 0; BBCodeInfo *fBBCode; - for (int i = 0; i < bbCodeCount; i++) - { + for (int i = 0; i < bbCodeCount; i++) { CHARRANGE range; FINDTEXTEX fte; @@ -141,8 +129,7 @@ void bbCodeParse(IFormattedTextDraw *ftd) continue; range = fte.chrgText; - if (bbCodes[i].end) - { + if (bbCodes[i].end) { fte.chrg.cpMin = fte.chrgText.cpMax; fte.lpstrText = bbCodes[i].end; ts->TxSendMessage(EM_FINDTEXTEX, (WPARAM)FR_DOWN, (LPARAM)&fte, &lResult); @@ -151,15 +138,13 @@ void bbCodeParse(IFormattedTextDraw *ftd) range.cpMax = fte.chrgText.cpMax; } - if ((fRange.cpMin == -1) || (fRange.cpMin > range.cpMin)) - { + if ((fRange.cpMin == -1) || (fRange.cpMin > range.cpMin)) { fRange = range; - fBBCode = bbCodes+i; + fBBCode = bbCodes + i; found = true; - if (fText) delete [] fText; - if (bbCodes[i].end) - { + if (fText) delete[] fText; + if (bbCodes[i].end) { TEXTRANGE trg; trg.chrg.cpMin = fte.chrg.cpMin; trg.chrg.cpMax = fte.chrgText.cpMin; @@ -170,10 +155,9 @@ void bbCodeParse(IFormattedTextDraw *ftd) } } - if (found) - { + if (found) { found = fBBCode->func(ftd, fRange, fText, fBBCode->cookie); - if (fText) delete [] fText; + if (fText) delete[] fText; } } } -- cgit v1.2.3