git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65241 954022d7-b5bf-4e40-9824-e11837661b57

a4f45300 · Oleg.Korshul · Alexander Trofimov · a6a3734f · a4f45300
Commit a4f45300 authored Oct 09, 2015 by Oleg.Korshul Committed by Alexander Trofimov May 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

HtmlFile/HtmlFile.cpp HtmlFile/HtmlFile.cpp +8 -0

No files found.
--- a/HtmlFile/HtmlFile.cpp
+++ b/HtmlFile/HtmlFile.cpp
@@ -1088,6 +1088,7 @@ namespace NSMht
                    oBuilderA.ClearNoAttack();
                    bool bIs16 = (oInnerFile.m_sContentEncoding.find(Names::code_QuotedPrintable) != std::string::npos) ? true : false;
+                    bool bIsBase64 = (oInnerFile.m_sContentEncoding.find(Names::code_Base64) != std::string::npos) ? true : false;
                    while (i != content.end() && i->find(boundary) == std::string::npos)
                    {
@@ -1099,6 +1100,9 @@ namespace NSMht
                        {
                            oBuilderA.WriteString(*i++);
                        }
+                        if (!bIsBase64)
+                            oBuilderA.AddCharSafe('\n');
                    }
                    oInnerFile.m_sData = oBuilderA.GetData();
                    oInnerFile.CorrectType();
@@ -1163,6 +1167,7 @@ namespace NSMht
                    oBuilderA.ClearNoAttack();
                    bool bIs16 = (oInnerFile.m_sContentEncoding.find(Names::code_QuotedPrintable) != std::string::npos) ? true : false;
+                    bool bIsBase64 = (oInnerFile.m_sContentEncoding.find(Names::code_Base64) != std::string::npos) ? true : false;
                    while (i != content.end() && i->find(boundary) == std::string::npos)
                    {
@@ -1174,6 +1179,9 @@ namespace NSMht
                        {
                            oBuilderA.WriteString(*i++);
                        }
+                        if (!bIsBase64)
+                            oBuilderA.AddCharSafe('\n');
                    }
                    oInnerFile.m_sData = oBuilderA.GetData();
                    oInnerFile.CorrectType();