From 4eeb916ff187d49b27931c523c14870dd3640389 Mon Sep 17 00:00:00 2001 From: MCpiroman Date: Fri, 19 Jul 2019 18:31:27 +0200 Subject: [PATCH 1/6] Refactor TextBuffer::GenHTML --- src/buffer/out/textBuffer.cpp | 311 ++++++++++++++-------------------- 1 file changed, 124 insertions(+), 187 deletions(-) diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index e1e0ecfd3a6..531dd1d20c9 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -6,10 +6,13 @@ #include "textBuffer.hpp" #include "CharRow.hpp" +#include "../types/inc/utils.hpp" #include "../types/inc/convert.hpp" +#include #pragma hdrstop +using namespace Microsoft::Console; using namespace Microsoft::Console::Types; // Routine Description: @@ -1033,238 +1036,172 @@ const TextBuffer::TextAndColor TextBuffer::GetTextForClipboard(const bool lineSe // - Generates a CF_HTML compliant structure based on the passed in text and color data // Arguments: // - rows - the text and color data we will format & encapsulate -// - iFontHeightPoints - the unscaled font height +// - fontHeightPoints - the unscaled font height // - fontFaceName - the name of the font used // Return Value: // - string containing the generated HTML -std::string TextBuffer::GenHTML(const TextAndColor& rows, const int iFontHeightPoints, const PCWCHAR fontFaceName) +std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPoints, const PCWCHAR fontFaceName) { - std::string szClipboard; // we will build the data going back in this string buffer - try { - std::string const szHtmlClipFormat = - "Version:0.9\r\n" - "StartHTML:%010d\r\n" - "EndHTML:%010d\r\n" - "StartFragment:%010d\r\n" - "EndFragment:%010d\r\n" - "StartSelection:%010d\r\n" - "EndSelection:%010d\r\n"; - - // measure clip header - size_t const cbHeader = 157; // when formats are expanded, there will be 157 bytes in the header. - - std::string const szHtmlHeader = - "Windows Console Host"; - size_t const cbHtmlHeader = szHtmlHeader.size(); - - std::string const szHtmlFragStart = ""; - std::string const szHtmlFragEnd = ""; - std::string const szHtmlFooter = ""; - size_t const cbHtmlFooter = szHtmlFooter.size(); - - std::string const szDivOuterBackgroundPattern = R"X(
)X"; - - size_t const cbDivOuter = 55; - std::string szDivOuter; - szDivOuter.reserve(cbDivOuter); - - std::string const szSpanFontSizePattern = R"X()X"; - - size_t const cbSpanFontSize = 28 + (iFontHeightPoints / 10) + 1; - - std::string szSpanFontSize; - szSpanFontSize.resize(cbSpanFontSize + 1); // reserve space for null after string for sprintf - sprintf_s(szSpanFontSize.data(), cbSpanFontSize + 1, szSpanFontSizePattern.data(), iFontHeightPoints); - szSpanFontSize.resize(cbSpanFontSize); //chop off null at end - - std::string const szSpanStartPattern = R"X()X"; - - size_t const cbSpanStart = 53; // when format is expanded, there will be 53 bytes per color pattern. - std::string szSpanStart; - szSpanStart.resize(cbSpanStart + 1); // +1 for null terminator + std::ostringstream htmlBuilder; - std::string const szSpanStartFontPattern = R"X()X"; - size_t const cbSpanStartFontPattern = 41; - - std::string const szSpanStartFontConstant = R"X()X"; - size_t const cbSpanStartFontConstant = 37; + // First we have to add some standard + // HTML boiler plate required for CF_HTML + // as part of the HTML Clipboard format + constexpr std::string_view HtmlHeader = + "Windows Terminal"; + htmlBuilder << HtmlHeader; - std::string szSpanStartFont; - size_t cbSpanStartFont; - bool fDeleteSpanStartFont = false; + htmlBuilder << ""; - std::wstring const wszFontFaceName = fontFaceName; - size_t const cchFontFaceName = wszFontFaceName.size(); - if (cchFontFaceName > 0) + // apply global style in div element { - // measure and create buffer to convert face name to UTF8 - int const cbNeeded = WideCharToMultiByte(CP_UTF8, 0, wszFontFaceName.data(), static_cast(cchFontFaceName), nullptr, 0, nullptr, nullptr); - std::string szBuffer; - szBuffer.resize(cbNeeded); + htmlBuilder << "
(cchFontFaceName), szBuffer.data(), cbNeeded, nullptr, nullptr); + htmlBuilder << "font-size:"; + htmlBuilder << fontHeightPoints; + htmlBuilder << "pt;"; - // format converted font name into pattern - std::string const szFinalFontPattern = R"X()X"; - size_t const cbBytesNeeded = szFinalFontPattern.length(); + // note: MS Word doesn't support padding (in this way at least) + htmlBuilder << "padding:"; + htmlBuilder << 4; // todo: customizable padding + htmlBuilder << "px;"; - fDeleteSpanStartFont = true; - szSpanStartFont = szFinalFontPattern; - cbSpanStartFont = cbBytesNeeded; - } - else - { - szSpanStartFont = szSpanStartFontConstant; - cbSpanStartFont = cbSpanStartFontConstant; + htmlBuilder << "\">"; } - std::string const szSpanEnd = ""; - std::string const szDivEnd = "
"; - - // Start building the HTML formated string to return - // First we have to add the required header and then - // some standard HTML boiler plate required for CF_HTML - // as part of the HTML Clipboard format - szClipboard.append(cbHeader, 'H'); // reserve space for a header we fill in later - szClipboard.append(szHtmlHeader); - szClipboard.append(szHtmlFragStart); - - COLORREF iBgColor = rows.BkAttr.at(0).at(0); - - szDivOuter.resize(cbDivOuter + 1); - sprintf_s(szDivOuter.data(), cbDivOuter + 1, szDivOuterBackgroundPattern.data(), GetRValue(iBgColor), GetGValue(iBgColor), GetBValue(iBgColor)); - szDivOuter.resize(cbDivOuter); - szClipboard.append(szDivOuter); - - // copy font face start - szClipboard.append(szSpanStartFont); - - // copy font size start - szClipboard.append(szSpanFontSize); - - bool bColorFound = false; - - // copy all text into the final clipboard data handle. There should be no nulls between rows of - // characters, but there should be a \0 at the end. - COLORREF const Blackness = RGB(0x00, 0x00, 0x00); - for (UINT iRow = 0; iRow < rows.text.size(); iRow++) + // copy text and info color from buffer + bool hasWroteAnyText = false; + std::optional fgColor = std::nullopt; + std::optional bkColor = std::nullopt; + for (UINT row = 0; row < rows.text.size(); row++) { - size_t cbStartOffset = 0; - size_t cchCharsToPrint = 0; + size_t startOffset = 0; - COLORREF fgColor = Blackness; - COLORREF bkColor = Blackness; - - for (UINT iCol = 0; iCol < rows.text.at(iRow).length(); iCol++) + if (row != 0) { - bool fColorDelta = false; + htmlBuilder << "
"; + } - if (!bColorFound) + for (UINT col = 0; col < rows.text[row].length(); col++) + { + // do not include \r nor \n as they don't have attributes + // and are not HTML friendly. For line break use '
' instead. + bool isLastCharInRow = + col == rows.text[row].length() - 1 || + rows.text[row][col + 1] == '\r' || + rows.text[row][col + 1] == '\n'; + + bool colorChanged = false; + if (!fgColor.has_value() || rows.FgAttr[row][col] != fgColor.value()) { - fgColor = rows.FgAttr.at(iRow).at(iCol); - bkColor = rows.BkAttr.at(iRow).at(iCol); - bColorFound = true; - fColorDelta = true; + fgColor = rows.FgAttr[row][col]; + colorChanged = true; } - else if ((rows.FgAttr.at(iRow).at(iCol) != fgColor) || (rows.BkAttr.at(iRow).at(iCol) != bkColor)) + + if (!bkColor.has_value() || rows.BkAttr[row][col] != bkColor.value()) { - fgColor = rows.FgAttr.at(iRow).at(iCol); - bkColor = rows.BkAttr.at(iRow).at(iCol); - fColorDelta = true; + bkColor = rows.BkAttr[row][col]; + colorChanged = true; } - if (fColorDelta) - { - if (cchCharsToPrint > 0) + const auto writeAccumulatedChars = [&](bool includeCurrent) { + if (col > startOffset) { - // write accumulated characters to stream .... - std::string TempBuff; - int const cbTempCharsNeeded = WideCharToMultiByte(CP_UTF8, 0, rows.text[iRow].data() + cbStartOffset, static_cast(cchCharsToPrint), nullptr, 0, nullptr, nullptr); - TempBuff.resize(cbTempCharsNeeded); - WideCharToMultiByte(CP_UTF8, 0, rows.text[iRow].data() + cbStartOffset, static_cast(cchCharsToPrint), TempBuff.data(), cbTempCharsNeeded, nullptr, nullptr); - szClipboard.append(TempBuff); - cbStartOffset += cchCharsToPrint; - cchCharsToPrint = 0; - - // close previous span - szClipboard += szSpanEnd; + // note: this should be escaped (for '<', '>', and '&'), + // however MS Word doesn't appear to support HTML entities + htmlBuilder << ConvertToA(CP_UTF8, std::wstring_view(rows.text[row].data() + startOffset, col - startOffset + includeCurrent)); + startOffset = col; } + }; - // start new span + if (colorChanged) + { + writeAccumulatedChars(false); - // format with color then copy formatted string - szSpanStart.resize(cbSpanStart + 1); // add room for null - sprintf_s(szSpanStart.data(), cbSpanStart + 1, szSpanStartPattern.data(), GetRValue(fgColor), GetGValue(fgColor), GetBValue(fgColor), GetRValue(bkColor), GetGValue(bkColor), GetBValue(bkColor)); - szSpanStart.resize(cbSpanStart); // chop null from sprintf - szClipboard.append(szSpanStart); - } + if (hasWroteAnyText) + { + htmlBuilder << ""; + } - // accumulate 1 character - cchCharsToPrint++; - } + htmlBuilder << ""; + } - PCWCHAR pwchAccumulateStart = rows.text.at(iRow).data() + cbStartOffset; + hasWroteAnyText = true; - // write accumulated characters to stream - std::string CharsConverted; - int cbCharsConverted = WideCharToMultiByte(CP_UTF8, 0, pwchAccumulateStart, static_cast(cchCharsToPrint), nullptr, 0, nullptr, nullptr); - CharsConverted.resize(cbCharsConverted); - WideCharToMultiByte(CP_UTF8, 0, pwchAccumulateStart, static_cast(cchCharsToPrint), CharsConverted.data(), cbCharsConverted, nullptr, nullptr); - szClipboard.append(CharsConverted); + if (isLastCharInRow) + { + writeAccumulatedChars(true); + break; + } + } } - if (bColorFound) + if (hasWroteAnyText) { - // copy end span - szClipboard.append(szSpanEnd); + // last opened span wasn't closed in loop above, so close it now + htmlBuilder << ""; } - // after we have copied all text we must wrap up - // with a standard set of HTML boilerplate required - // by CF_HTML - - // copy end font size span - szClipboard.append(szSpanEnd); - - // copy end font face span - szClipboard.append(szSpanEnd); + htmlBuilder << "
"; - // copy end background color span - szClipboard.append(szDivEnd); + htmlBuilder << ""; - // copy HTML end fragment - szClipboard.append(szHtmlFragEnd); + constexpr std::string_view HtmlFooter = ""; + htmlBuilder << HtmlFooter; - // copy HTML footer - szClipboard.append(szHtmlFooter); + // once filled with values, there will be exactly 157 bytes in the clipboard header + constexpr size_t ClipboardHeaderSize = 157; - // null terminate the clipboard data - szClipboard += '\0'; + // these values are byte offsets from start of clipboard + const size_t htmlStartPos = ClipboardHeaderSize; + const size_t htmlEndPos = ClipboardHeaderSize + htmlBuilder.tellp(); + const size_t fragStartPos = ClipboardHeaderSize + HtmlHeader.length(); + const size_t fragEndPos = htmlEndPos - HtmlFooter.length(); - // we are done generating formating & building HTML for the selection - // prepare the header text with the byte counts now that we know them - size_t const cbHtmlStart = cbHeader; // bytecount to start of HTML context - size_t const cbHtmlEnd = szClipboard.size() - 1; // don't count the null at the end - size_t const cbFragStart = cbHeader + cbHtmlHeader; // bytecount to start of selection fragment - size_t const cbFragEnd = cbHtmlEnd - cbHtmlFooter; + // header required by HTML 0.9 format + std::ostringstream clipHeaderBuilder; + clipHeaderBuilder << "Version:0.9\r\n"; + clipHeaderBuilder << std::setfill('0'); + clipHeaderBuilder << "StartHTML:" << std::setw(10) << htmlStartPos << "\r\n"; + clipHeaderBuilder << "EndHTML:" << std::setw(10) << htmlEndPos << "\r\n"; + clipHeaderBuilder << "StartFragment:" << std::setw(10) << fragStartPos << "\r\n"; + clipHeaderBuilder << "EndFragment:" << std::setw(10) << fragEndPos << "\r\n"; + clipHeaderBuilder << "StartSelection:" << std::setw(10) << fragStartPos << "\r\n"; + clipHeaderBuilder << "EndSelection:" << std::setw(10) << fragEndPos << "\r\n"; - // push the values into the required HTML 0.9 header format - std::string szHtmlClipHeaderFinal; - szHtmlClipHeaderFinal.resize(cbHeader + 1); // add room for a null - sprintf_s(szHtmlClipHeaderFinal.data(), cbHeader + 1, szHtmlClipFormat.data(), cbHtmlStart, cbHtmlEnd, cbFragStart, cbFragEnd, cbFragStart, cbFragEnd); - szHtmlClipHeaderFinal.resize(cbHeader); // chop off the null - - // overwrite the reserved space with the actual header & offsets we calculated - szClipboard.replace(0, cbHeader, szHtmlClipHeaderFinal.data()); + return clipHeaderBuilder.str() + htmlBuilder.str(); } catch (...) { LOG_HR(wil::ResultFromCaughtException()); - szClipboard.clear(); // dont return a partial html fragment... + return ""; } - - return szClipboard; } From 93c1fdccc00d7c30934f9e7b5e80ecb1cddbc4f4 Mon Sep 17 00:00:00 2001 From: MCpiroman Date: Thu, 25 Jul 2019 23:10:44 +0200 Subject: [PATCH 2/6] PR changes --- src/buffer/out/textBuffer.cpp | 15 ++++++++------- src/buffer/out/textBuffer.hpp | 5 +++-- src/cascadia/TerminalControl/TermControl.cpp | 4 ++-- src/interactivity/win32/Clipboard.cpp | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index 531dd1d20c9..8677d2d4b9e 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -1038,9 +1038,10 @@ const TextBuffer::TextAndColor TextBuffer::GetTextForClipboard(const bool lineSe // - rows - the text and color data we will format & encapsulate // - fontHeightPoints - the unscaled font height // - fontFaceName - the name of the font used +// - htmlTitle - value used in title tag of html header. Used to name the application // Return Value: // - string containing the generated HTML -std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPoints, const PCWCHAR fontFaceName) +std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPoints, const PCWCHAR fontFaceName, const std::string htmlTitle) { try { @@ -1049,8 +1050,8 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo // First we have to add some standard // HTML boiler plate required for CF_HTML // as part of the HTML Clipboard format - constexpr std::string_view HtmlHeader = - "Windows Terminal"; + const std::string HtmlHeader = + "" + htmlTitle + ""; htmlBuilder << HtmlHeader; htmlBuilder << ""; @@ -1091,7 +1092,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo } // copy text and info color from buffer - bool hasWroteAnyText = false; + bool hasWrittenAnyText = false; std::optional fgColor = std::nullopt; std::optional bkColor = std::nullopt; for (UINT row = 0; row < rows.text.size(); row++) @@ -1139,7 +1140,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo { writeAccumulatedChars(false); - if (hasWroteAnyText) + if (hasWrittenAnyText) { htmlBuilder << ""; } @@ -1154,7 +1155,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo htmlBuilder << "\">"; } - hasWroteAnyText = true; + hasWrittenAnyText = true; if (isLastCharInRow) { @@ -1164,7 +1165,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo } } - if (hasWroteAnyText) + if (hasWrittenAnyText) { // last opened span wasn't closed in loop above, so close it now htmlBuilder << ""; diff --git a/src/buffer/out/textBuffer.hpp b/src/buffer/out/textBuffer.hpp index 78025086b0e..9a0d0212417 100644 --- a/src/buffer/out/textBuffer.hpp +++ b/src/buffer/out/textBuffer.hpp @@ -145,8 +145,9 @@ class TextBuffer final std::function GetBackgroundColor) const; static std::string GenHTML(const TextAndColor& rows, - const int iFontHeightPoints, - const PCWCHAR fontFaceName); + const int fontHeightPoints, + const PCWCHAR fontFaceName, + const std::string htmlTitle); private: std::deque _storage; diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index 28bc0562759..955fd05b2dd 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -1194,8 +1194,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } // convert text to HTML format - const auto htmlData = TextBuffer::GenHTML(bufferData, _actualFont.GetUnscaledSize().Y, _actualFont.GetFaceName()); - + const auto htmlData = TextBuffer::GenHTML(bufferData, _actualFont.GetUnscaledSize().Y, _actualFont.GetFaceName(), "Windows Terminal"); + _terminal->ClearSelection(); // send data up for clipboard diff --git a/src/interactivity/win32/Clipboard.cpp b/src/interactivity/win32/Clipboard.cpp index ea58120b096..54a48b4048a 100644 --- a/src/interactivity/win32/Clipboard.cpp +++ b/src/interactivity/win32/Clipboard.cpp @@ -277,7 +277,7 @@ void Clipboard::CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, { const auto& fontData = ServiceLocator::LocateGlobals().getConsoleInformation().GetActiveOutputBuffer().GetCurrentFont(); int const iFontHeightPoints = fontData.GetUnscaledSize().Y * 72 / ServiceLocator::LocateGlobals().dpi; - std::string HTMLToPlaceOnClip = TextBuffer::GenHTML(rows, iFontHeightPoints, fontData.GetFaceName()); + std::string HTMLToPlaceOnClip = TextBuffer::GenHTML(rows, iFontHeightPoints, fontData.GetFaceName(), "Windows Console Host"); const size_t cbNeededHTML = HTMLToPlaceOnClip.size(); if (cbNeededHTML) { From 4957ce25264784d6872c81ece845d7c4d3d8a7ee Mon Sep 17 00:00:00 2001 From: MCpiroman Date: Thu, 25 Jul 2019 23:20:57 +0200 Subject: [PATCH 3/6] Rename not-const var --- src/buffer/out/textBuffer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index 8677d2d4b9e..d1453a46515 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -1050,9 +1050,9 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo // First we have to add some standard // HTML boiler plate required for CF_HTML // as part of the HTML Clipboard format - const std::string HtmlHeader = + const std::string htmlHeader = "" + htmlTitle + ""; - htmlBuilder << HtmlHeader; + htmlBuilder << htmlHeader; htmlBuilder << ""; @@ -1184,7 +1184,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo // these values are byte offsets from start of clipboard const size_t htmlStartPos = ClipboardHeaderSize; const size_t htmlEndPos = ClipboardHeaderSize + htmlBuilder.tellp(); - const size_t fragStartPos = ClipboardHeaderSize + HtmlHeader.length(); + const size_t fragStartPos = ClipboardHeaderSize + htmlHeader.length(); const size_t fragEndPos = htmlEndPos - HtmlFooter.length(); // header required by HTML 0.9 format From 91ee8a9a9d0f76abbd829f0f6e8b7658bbd16369 Mon Sep 17 00:00:00 2001 From: MCpiroman Date: Fri, 26 Jul 2019 22:23:26 +0200 Subject: [PATCH 4/6] PR changes --- src/buffer/out/textBuffer.cpp | 7 ++++--- src/buffer/out/textBuffer.hpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index d1453a46515..e8785c9c80a 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -1041,7 +1041,7 @@ const TextBuffer::TextAndColor TextBuffer::GetTextForClipboard(const bool lineSe // - htmlTitle - value used in title tag of html header. Used to name the application // Return Value: // - string containing the generated HTML -std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPoints, const PCWCHAR fontFaceName, const std::string htmlTitle) +std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPoints, const PCWCHAR fontFaceName, const std::string& htmlTitle) { try { @@ -1070,9 +1070,10 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo htmlBuilder << Utils::ColorToHexString(globalBgColor); htmlBuilder << ";"; - htmlBuilder << "font-family:'"; + htmlBuilder << "font-family:"; if (fontFaceName[0] != '\0') { + htmlBuilder << "'"; htmlBuilder << ConvertToA(CP_UTF8, fontFaceName); htmlBuilder << "',"; } @@ -1203,6 +1204,6 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo catch (...) { LOG_HR(wil::ResultFromCaughtException()); - return ""; + return {}; } } diff --git a/src/buffer/out/textBuffer.hpp b/src/buffer/out/textBuffer.hpp index 9a0d0212417..0143f2b88f7 100644 --- a/src/buffer/out/textBuffer.hpp +++ b/src/buffer/out/textBuffer.hpp @@ -147,7 +147,7 @@ class TextBuffer final static std::string GenHTML(const TextAndColor& rows, const int fontHeightPoints, const PCWCHAR fontFaceName, - const std::string htmlTitle); + const std::string& htmlTitle); private: std::deque _storage; From 5f8d706ca749b616d44008a7959cf7e3dd7af9ba Mon Sep 17 00:00:00 2001 From: MCpiroman Date: Sat, 27 Jul 2019 14:44:30 +0200 Subject: [PATCH 5/6] ops this shouldn't be here --- src/buffer/out/textBuffer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index e8785c9c80a..4813d56b202 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -1059,8 +1059,7 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows, const int fontHeightPo // apply global style in div element { htmlBuilder << "
Date: Thu, 1 Aug 2019 19:39:23 +0200 Subject: [PATCH 6/6] Remove unnecessary include --- src/buffer/out/textBuffer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp index 4813d56b202..9164282d99a 100644 --- a/src/buffer/out/textBuffer.cpp +++ b/src/buffer/out/textBuffer.cpp @@ -8,7 +8,6 @@ #include "../types/inc/utils.hpp" #include "../types/inc/convert.hpp" -#include #pragma hdrstop