From 342c2aed9132eb35cb0ff362a55871b4086878b7 Mon Sep 17 00:00:00 2001 From: konovalovsergey Date: Fri, 3 Jun 2016 14:24:32 +0300 Subject: [PATCH] =?UTF-8?q?for=20Bug=2032510=20-=20[Review][Conversion]=20?= =?UTF-8?q?=D0=9D=D0=B5=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20Review=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=82=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BE=D0=BA=D1=83?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ASCOfficeDocxFile2/BinReader/Readers.h | 12 ++++++++++++ .../BinWriter/BinReaderWriterDefines.h | 3 ++- ASCOfficeDocxFile2/BinWriter/BinWriters.h | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ASCOfficeDocxFile2/BinReader/Readers.h b/ASCOfficeDocxFile2/BinReader/Readers.h index fef1845d7a..b94a9941a8 100644 --- a/ASCOfficeDocxFile2/BinReader/Readers.h +++ b/ASCOfficeDocxFile2/BinReader/Readers.h @@ -2967,6 +2967,18 @@ public: res = Read1(length, &Binary_SettingsTableReader::ReadMathPr, this, poResult); m_oFileWriter.m_oSettingWriter.AddSetting(_T("")); } + else if ( c_oSer_SettingsType::TrackRevisions == type ) + { + bool bTrackRevisions = m_oBufferedStream.GetBool(); + if (bTrackRevisions) + { + m_oFileWriter.m_oSettingWriter.AddSetting(L""); + } + else + { + m_oFileWriter.m_oSettingWriter.AddSetting(L""); + } + } else res = c_oSerConstants::ReadUnknown; return res; diff --git a/ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h b/ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h index 158ad2e438..dcc4b28923 100644 --- a/ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h +++ b/ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h @@ -652,7 +652,8 @@ extern int g_nCurFormatVersion; { ClrSchemeMapping = 0, DefaultTabStop = 1, - MathPr = 2 + MathPr = 2, + TrackRevisions = 3 };} namespace c_oSer_MathPrType{enum c_oSer_SettingsType { diff --git a/ASCOfficeDocxFile2/BinWriter/BinWriters.h b/ASCOfficeDocxFile2/BinWriter/BinWriters.h index b9489888ec..7203a4d8e5 100644 --- a/ASCOfficeDocxFile2/BinWriter/BinWriters.h +++ b/ASCOfficeDocxFile2/BinWriter/BinWriters.h @@ -6451,6 +6451,12 @@ namespace BinDocxRW WriteMathPr(oSettings.m_oMathPr.get()); m_oBcw.WriteItemEnd(nCurPos); } + if(oSettings.m_oTrackRevisions.IsInit()) + { + nCurPos = m_oBcw.WriteItemStart(c_oSer_SettingsType::TrackRevisions); + m_oBcw.m_oStream.WriteBOOL(oSettings.m_oTrackRevisions->m_oVal.ToBool()); + m_oBcw.WriteItemEnd(nCurPos); + } }; void WriteMathPr(const OOX::Logic::CMathPr &pMathPr) {