Skip to content

O
onlyoffice_core
Commit f960fc60 authored by Sergey Konovalov's avatar Sergey Konovalov
Browse files
Options

removed all stubs for FldChar

parent 64213746
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 155 deletions
ASCOfficeDocxFile2/BinReader/Readers.h
View file @ f960fc60
...@@ -4008,6 +4008,19 @@ public: ...@@ -4008,6 +4008,19 @@ public:
res = c_oSerConstants::ReadUnknown; res = c_oSerConstants::ReadUnknown;
return res; return res;
} }
int ReadFldChar(BYTE type, long length, void* poResult)
{
int res = c_oSerConstants::ReadOk;
OOX::Logic::CFldChar* pFldChar = static_cast<OOX::Logic::CFldChar*>(poResult);
if ( c_oSer_FldSimpleType::CharType == type )
{
pFldChar->m_oFldCharType.Init();
pFldChar->m_oFldCharType->SetValue((SimpleTypes::EFldCharType)m_oBufferedStream.GetUChar());
}
else
res = c_oSerConstants::ReadUnknown;
return res;
}
int ReadFldSimple(BYTE type, long length, void* poResult) int ReadFldSimple(BYTE type, long length, void* poResult)
{ {
int res = c_oSerConstants::ReadOk; int res = c_oSerConstants::ReadOk;
...@@ -6634,7 +6647,7 @@ public: ...@@ -6634,7 +6647,7 @@ public:
//сбрасываем Shd //сбрасываем Shd
oBinary_tblPrReader.m_sCurTableShd.clear(); oBinary_tblPrReader.m_sCurTableShd.clear();
} }
else if(c_oSerRunType::fldstart == type) else if(c_oSerRunType::fldstart_deprecated == type)
{ {
std::wstring sField(m_oBufferedStream.GetString3(length)); std::wstring sField(m_oBufferedStream.GetString3(length));
sField = XmlUtils::EncodeXmlString(sField); sField = XmlUtils::EncodeXmlString(sField);
...@@ -6648,7 +6661,7 @@ public: ...@@ -6648,7 +6661,7 @@ public:
m_oCur_rPr.Write(&GetRunStringWriter()); m_oCur_rPr.Write(&GetRunStringWriter());
GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"separate\"/>"))); GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"separate\"/>")));
} }
else if(c_oSerRunType::fldend == type) else if(c_oSerRunType::fldend_deprecated == type)
{ {
GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"end\"/>"))); GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"end\"/>")));
} }
...@@ -6697,6 +6710,28 @@ public: ...@@ -6697,6 +6710,28 @@ public:
res = Read1(length, &Binary_DocumentTableReader::ReadEndnoteRef, this, &oEndnoteRef); res = Read1(length, &Binary_DocumentTableReader::ReadEndnoteRef, this, &oEndnoteRef);
GetRunStringWriter().WriteString(oEndnoteRef.toXML()); GetRunStringWriter().WriteString(oEndnoteRef.toXML());
} }
else if ( c_oSerRunType::fldChar == type)
{
OOX::Logic::CFldChar oFldChar;
res = Read1(length, &Binary_DocumentTableReader::ReadFldChar, this, &oFldChar);
GetRunStringWriter().WriteString(oFldChar.toXML());
}
else if ( c_oSerRunType::instrText == type)
{
GetRunStringWriter().WriteString(std::wstring(_T("<w:instrText xml:space=\"preserve\">")));
std::wstring sText(m_oBufferedStream.GetString3(length));
sText = XmlUtils::EncodeXmlString(sText);
GetRunStringWriter().WriteString(sText);
GetRunStringWriter().WriteString(std::wstring(_T("</w:instrText>")));
}
else if ( c_oSerRunType::delInstrText == type)
{
GetRunStringWriter().WriteString(std::wstring(_T("<w:delInstrText xml:space=\"preserve\">")));
std::wstring sText(m_oBufferedStream.GetString3(length));
sText = XmlUtils::EncodeXmlString(sText);
GetRunStringWriter().WriteString(sText);
GetRunStringWriter().WriteString(std::wstring(_T("</w:delInstrText>")));
}
else else
res = c_oSerConstants::ReadUnknown; res = c_oSerConstants::ReadUnknown;
return res; return res;
......
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
View file @ f960fc60
...@@ -503,8 +503,8 @@ extern int g_nCurFormatVersion; ...@@ -503,8 +503,8 @@ extern int g_nCurFormatVersion;
image = 6, image = 6,
table = 7, table = 7,
Content = 8, Content = 8,
fldstart = 9, fldstart_deprecated = 9,
fldend = 10, fldend_deprecated = 10,
CommentReference = 11, CommentReference = 11,
pptxDrawing = 12, pptxDrawing = 12,
object = 14, object = 14,
...@@ -521,7 +521,10 @@ extern int g_nCurFormatVersion; ...@@ -521,7 +521,10 @@ extern int g_nCurFormatVersion;
endnoteRef = 25, endnoteRef = 25,
footnoteReference = 26, footnoteReference = 26,
endnoteReference = 27, endnoteReference = 27,
arPr = 28 arPr = 28,
fldChar = 29,
instrText = 30,
delInstrText = 31
};} };}
namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType
{ {
...@@ -929,7 +932,8 @@ extern int g_nCurFormatVersion; ...@@ -929,7 +932,8 @@ extern int g_nCurFormatVersion;
{ {
Content = 0, Content = 0,
Instr = 1, Instr = 1,
FFData = 2 FFData = 2,
CharType = 3
};} };}
namespace c_oSer_ColorThemeType{ enum c_oSer_ColorThemeType namespace c_oSer_ColorThemeType{ enum c_oSer_ColorThemeType
{ {
......
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ f960fc60
...@@ -76,18 +76,6 @@ namespace BinDocxRW ...@@ -76,18 +76,6 @@ namespace BinDocxRW
{ {
} }
}; };
class FldStruct
{
protected:
int m_nType;
public:
std::wstring m_sFld;
FldStruct(std::wstring sFld, int nType):m_sFld(sFld),m_nType(nType){}
int GetType()
{
return m_nType;
}
};
class BinaryCommonWriter class BinaryCommonWriter
{ {
public: public:
...@@ -2992,11 +2980,6 @@ namespace BinDocxRW ...@@ -2992,11 +2980,6 @@ namespace BinDocxRW
std::wstring m_sCurParStyle; std::wstring m_sCurParStyle;
OOX::CSettings* m_oSettings; OOX::CSettings* m_oSettings;
//для fldChar
//todo в документации описан случай если нет fldchartypeEnd, у нас работает не так.
std::vector<FldStruct*> m_aFldChars;
std::wstring m_sFldChar;
SimpleTypes::EFldCharType m_eFldState;
NSBinPptxRW::CDrawingConverter* m_pOfficeDrawingConverter; NSBinPptxRW::CDrawingConverter* m_pOfficeDrawingConverter;
std::map<int, bool>* m_mapIgnoreComments; std::map<int, bool>* m_mapIgnoreComments;
public: public:
...@@ -3012,14 +2995,6 @@ namespace BinDocxRW ...@@ -3012,14 +2995,6 @@ namespace BinDocxRW
pBackground = NULL; pBackground = NULL;
pSectPr = NULL; pSectPr = NULL;
m_bWriteSectPr = false; m_bWriteSectPr = false;
m_eFldState = SimpleTypes::fldchartypeEnd;
}
~BinaryDocumentTableWriter()
{
for(size_t i = 0, length = m_aFldChars.size(); i < length; ++i)
{
RELEASEOBJECT(m_aFldChars[i]);
}
} }
void prepareOfficeDrawingConverter(NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, OOX::IFileContainer *rels, std::vector<std::wstring>& aShapeTypes) void prepareOfficeDrawingConverter(NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, OOX::IFileContainer *rels, std::vector<std::wstring>& aShapeTypes)
{ {
...@@ -3169,24 +3144,6 @@ namespace BinDocxRW ...@@ -3169,24 +3144,6 @@ namespace BinDocxRW
m_oBcw.WriteItemWithLengthEnd(nCurPos); m_oBcw.WriteItemWithLengthEnd(nCurPos);
} }
FldStruct* ParseField(const std::wstring& sFld)
{
std::wstring sFldCopy = sFld;
boost::algorithm::trim (sFldCopy);
boost::algorithm::to_upper (sFldCopy);
FldStruct* pRes = NULL;
int nIndex = 0;
if(-1 != (nIndex = (int)sFldCopy.find(_T("TOC"))))
pRes = new FldStruct(sFldCopy, fieldstruct_toc);
else if(-1 != (nIndex = (int)sFldCopy.find(_T("HYPERLINK"))))
pRes = new FldStruct(sFldCopy, fieldstruct_hyperlink);
else
pRes = new FldStruct(sFldCopy, fieldstruct_none);
return pRes;
}
void WriteParagraphContent(const std::vector<OOX::WritingElement *>& Content, bool bHyperlink = false) void WriteParagraphContent(const std::vector<OOX::WritingElement *>& Content, bool bHyperlink = false)
{ {
int nCurPos = 0; int nCurPos = 0;
...@@ -3465,6 +3422,16 @@ namespace BinDocxRW ...@@ -3465,6 +3422,16 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos); m_oBcw.WriteItemEnd(nCurPos);
} }
} }
void WriteFldChar(OOX::Logic::CFldChar* pFldChar)
{
int nCurPos = 0;
if(pFldChar->m_oFldCharType.IsInit())
{
nCurPos = m_oBcw.WriteItemStart(c_oSer_FldSimpleType::CharType);
m_oBcw.m_oStream.WriteBYTE((BYTE)pFldChar->m_oFldCharType->GetValue());
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
void WriteFldSimple(OOX::Logic::CFldSimple* pFldSimple) void WriteFldSimple(OOX::Logic::CFldSimple* pFldSimple)
{ {
int nCurPos = 0; int nCurPos = 0;
...@@ -5422,51 +5389,6 @@ namespace BinDocxRW ...@@ -5422,51 +5389,6 @@ namespace BinDocxRW
int nCurPos = 0; int nCurPos = 0;
OOX::Logic::CRunProperty* oCur_rPr = pRun->m_oRunProperty; OOX::Logic::CRunProperty* oCur_rPr = pRun->m_oRunProperty;
if(NULL != oCur_rPr)
{
//Заглушка для содержания
if(false == bHyperlink)
{
//Случай если Hyperlink задан как field
for(size_t i = 0, length = m_aFldChars.size(); i < length; ++i)
{
if(fieldstruct_hyperlink == m_aFldChars[i]->GetType())
{
bHyperlink = true;
break;
}
}
}
if(bHyperlink)
{
bool bInTOC = false;
for(size_t i = 0, length = m_aFldChars.size(); i < length; ++i)
{
if(fieldstruct_toc == m_aFldChars[i]->GetType())
{
bInTOC = true;
break;
}
}
if(bInTOC)
{
//убираем Runstyle
if(oCur_rPr->m_oRStyle.IsInit())
oCur_rPr->m_oRStyle.reset();
//Если настройки выставлены явно, то убираем их
if(oCur_rPr->m_oColor.IsInit() && oCur_rPr->m_oColor->m_oVal.IsInit() && SimpleTypes::hexcolorRGB == oCur_rPr->m_oColor->m_oVal->GetValue())
{
unsigned char bR = oCur_rPr->m_oColor->m_oVal->Get_R();
unsigned char bG = oCur_rPr->m_oColor->m_oVal->Get_G();
unsigned char bB = oCur_rPr->m_oColor->m_oVal->Get_B();
if(0x00 == bR && 0x00 == bG && 0xFF == bB)
oCur_rPr->m_oColor->m_oVal->Set_B(0x00);
}
if(oCur_rPr->m_oU.IsInit() && oCur_rPr->m_oU->m_oVal.IsInit() && SimpleTypes::underlineSingle == oCur_rPr->m_oU->m_oVal->GetValue())
oCur_rPr->m_oU->m_oVal->SetValue(SimpleTypes::underlineNone);
}
}
}
//Если первый элемент символ надо выставить в его настройки шрифт //Если первый элемент символ надо выставить в его настройки шрифт
if(nIndexStart < (int)pRun->m_arrItems.size() && OOX::et_w_sym == pRun->m_arrItems[nIndexStart]->getType()) if(nIndexStart < (int)pRun->m_arrItems.size() && OOX::et_w_sym == pRun->m_arrItems[nIndexStart]->getType())
{ {
...@@ -5543,51 +5465,21 @@ namespace BinDocxRW ...@@ -5543,51 +5465,21 @@ namespace BinDocxRW
case OOX::et_w_fldChar: case OOX::et_w_fldChar:
{ {
OOX::Logic::CFldChar* pFldChar = static_cast<OOX::Logic::CFldChar*>(item); OOX::Logic::CFldChar* pFldChar = static_cast<OOX::Logic::CFldChar*>(item);
if(pFldChar->m_oFldCharType.IsInit()) int nCurPos = m_oBcw.WriteItemStart(c_oSerRunType::fldChar);
{ WriteFldChar(pFldChar);
if(SimpleTypes::fldchartypeBegin == pFldChar->m_oFldCharType.get().GetValue()) m_oBcw.WriteItemEnd(nCurPos);
{
m_eFldState = SimpleTypes::fldchartypeBegin;
m_sFldChar.clear();
}
else if(SimpleTypes::fldchartypeEnd == pFldChar->m_oFldCharType.get().GetValue())
{
m_eFldState = SimpleTypes::fldchartypeEnd;
if(m_aFldChars.size() > 0)
{
int nIndex = (int)m_aFldChars.size() - 1;
FldStruct* pFldStruct = m_aFldChars[nIndex];
RELEASEOBJECT(pFldStruct);
m_aFldChars.erase(m_aFldChars.begin() + nIndex);
m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::fldend);
m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
}
} }
else if(SimpleTypes::fldchartypeSeparate == pFldChar->m_oFldCharType.get().GetValue()) break;
case OOX::et_w_delInstrText:
{ {
m_eFldState = SimpleTypes::fldchartypeSeparate; OOX::Logic::CDelInstrText* pInstrText = static_cast<OOX::Logic::CDelInstrText*>(item);
FldStruct* pFldStruct = ParseField(m_sFldChar); WriteText(pInstrText->m_sText, c_oSerRunType::delInstrText);
m_aFldChars.push_back(pFldStruct);
m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::fldstart);
m_oBcw.m_oStream.WriteStringW(m_sFldChar);
}
}
} }
break; break;
case OOX::et_w_instrText: case OOX::et_w_instrText:
{ {
OOX::Logic::CInstrText* pInstrText = static_cast<OOX::Logic::CInstrText*>(item); OOX::Logic::CInstrText* pInstrText = static_cast<OOX::Logic::CInstrText*>(item);
if(SimpleTypes::fldchartypeBegin == m_eFldState) WriteText(pInstrText->m_sText, c_oSerRunType::instrText);
m_sFldChar += pInstrText->m_sText;
else
{
if(!pInstrText->m_sText.empty())
{
WriteText(pInstrText->m_sText);
}
}
} }
break; break;
case OOX::et_w_nonBreakHyphen: case OOX::et_w_nonBreakHyphen:
...@@ -5619,25 +5511,19 @@ namespace BinDocxRW ...@@ -5619,25 +5511,19 @@ namespace BinDocxRW
OOX::Logic::CSym* oSym = static_cast<OOX::Logic::CSym*>(item); OOX::Logic::CSym* oSym = static_cast<OOX::Logic::CSym*>(item);
wchar_t ch = 0x0FFF & oSym->m_oChar->GetValue(); wchar_t ch = 0x0FFF & oSym->m_oChar->GetValue();
std::wstring sText(&ch, 1); std::wstring sText(&ch, 1);
WriteText(sText); WriteText(sText, c_oSerRunType::run);
break; break;
} }
case OOX::et_w_delText: case OOX::et_w_delText:
{ {
std::wstring& sText = static_cast<OOX::Logic::CDelText*>(item)->m_sText; std::wstring& sText = static_cast<OOX::Logic::CDelText*>(item)->m_sText;
if(!sText.empty()) WriteText(sText, c_oSerRunType::delText);
{
WriteDelText(sText);
}
} }
break; break;
case OOX::et_w_t: case OOX::et_w_t:
{ {
std::wstring& sText = static_cast<OOX::Logic::CText*>(item)->m_sText; std::wstring& sText = static_cast<OOX::Logic::CText*>(item)->m_sText;
if(!sText.empty()) WriteText(sText, c_oSerRunType::run);
{
WriteText(sText);
}
} }
break; break;
case OOX::et_w_tab: case OOX::et_w_tab:
...@@ -5727,20 +5613,16 @@ namespace BinDocxRW ...@@ -5727,20 +5613,16 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos); m_oBcw.WriteItemEnd(nCurPos);
} }
} }
void WriteDelText(const std::wstring& text) void WriteText(const std::wstring& text, BYTE type)
{ {
m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::delText); if(!text.empty())
m_oBcw.m_oStream.WriteStringW(text.c_str());
if(NULL != m_oBcw.m_pEmbeddedFontsManager)
m_oBcw.m_pEmbeddedFontsManager->CheckString(text);
}
void WriteText(const std::wstring& text)
{ {
m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::run); m_oBcw.m_oStream.WriteBYTE(type);
m_oBcw.m_oStream.WriteStringW(text); m_oBcw.m_oStream.WriteStringW(text);
if(NULL != m_oBcw.m_pEmbeddedFontsManager) if(NULL != m_oBcw.m_pEmbeddedFontsManager)
m_oBcw.m_pEmbeddedFontsManager->CheckString(text); m_oBcw.m_pEmbeddedFontsManager->CheckString(text);
} }
}
void WriteDrawingPptx(OOX::WritingElement* item) void WriteDrawingPptx(OOX::WritingElement* item)
{ {
if (item == NULL) return; if (item == NULL) return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7