Skip to content

O
onlyoffice_core
Commit a7f066d9 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov
Browse files
Options

не прибавляем к CString char* 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67857 954022d7-b5bf-4e40-9824-e11837661b57
parent 4c49a9b1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 748 additions and 748 deletions
Common/DocxFormat/Source/DocxFormat/Document.h
View file @ a7f066d9
#pragma once
#pragma once
#ifndef OOX_DOCUMENT_FILE_INCLUDE_H_
#define OOX_DOCUMENT_FILE_INCLUDE_H_
......@@ -31,7 +31,7 @@ namespace OOX
// Background 17.2.1 (Part 1)
//--------------------------------------------------------------------------------
// TO DO: CDrawing
// TO DO: Когда будет реализован класс CDrawing добавить его обработку тут
class CBackground : public WritingElement
{
public:
......@@ -73,30 +73,30 @@ namespace OOX
if ( m_oColor.IsInit() )
{
sResult += "w:color=\"";
sResult += _T("w:color=\"");
sResult += m_oColor->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oThemeColor.IsInit() )
{
sResult += "w:themeColor=\"";
sResult += _T("w:themeColor=\"");
sResult += m_oThemeColor->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oThemeShade.IsInit() )
{
sResult += "w:themeShade=\"";
sResult += _T("w:themeShade=\"");
sResult += m_oThemeShade->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oThemeTint.IsInit() )
{
sResult += "w:themeTint=\"";
sResult += _T("w:themeTint=\"");
sResult += m_oThemeTint->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDrawing.IsInit() )
......@@ -120,7 +120,7 @@ namespace OOX
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:color"), m_oColor )
......@@ -148,7 +148,7 @@ namespace OOX
namespace OOX
{
// TO DO: :
// TO DO: Нехватающие классы:
// <w:altChunk>
// <w:customXml>
// <w:moveFrom>
......@@ -459,33 +459,33 @@ namespace OOX
}
void AddImage(const CPath& oImagePath, const long lWidth, const long lHeight)
{
//// TO DO: Image
//// TO DO: Сделать добавление Image
//OOX::Image* pImage = new OOX::Image( oImagePath );
//const RId rId = add( smart_ptr<OOX::File>(pImage) );
//WritingElement *pPara = new OOX::Logic::CParagraph();
////
//// Добавить добавление картинки в параграф
//m_arrItems.push_back( pPara );
}
void AddImage(const CPath& oImagePath, const long lEmuX, const CString& sHRelativeFrom, const long lEmuY, const CString& sVRelativeFrom, const long lWidthEmu, const long lHeightEmu)
{
//// TO DO: Image
//// TO DO: Сделать добавление Image
//OOX::Image* pImage = new OOX::Image( oImagePath );
//const RId rId = add( smart_ptr<OOX::File>(pImage) );
//WritingElement *pPara = new OOX::Logic::CParagraph();
////
//// Добавить добавление картинки в параграф
//m_arrItems.push_back( pPara );
}
void AddImageInBegin(const CPath& oImagePath, const long lWidth, const long lHeight)
{
//// TO DO: Image
//// TO DO: Сделать добавление Image
//ClearItems();
......@@ -494,7 +494,7 @@ namespace OOX
//WritingElement *pPara = new OOX::Logic::CParagraph();
////
//// Добавить добавление картинки в параграф
//m_arrItems.push_back( pPara );
}
......@@ -547,7 +547,7 @@ namespace OOX
smart_ptr<OOX::File> oHyperlink = smart_ptr<OOX::File>( new OOX::HyperLink( sNameHref ) );
const OOX::RId rId = Add( oHyperlink );
// TO DO:
// TO DO: Сделать добавление гиперссылок в параграфах
//pPara->AddHyperlink( rId, sText );
m_arrItems.push_back( pNewElement );
......@@ -561,7 +561,7 @@ namespace OOX
smart_ptr<OOX::File> oHyperlink = smart_ptr<OOX::File>( new OOX::HyperLink( sNameHref ) );
const OOX::RId rId = Add( oHyperlink );
// TO DO:
// TO DO: Сделать добавление гиперссылок в параграфах
//pPara->AddHyperlink( rId, sText );
}
}
......@@ -569,7 +569,7 @@ namespace OOX
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:conformance"), m_oConformance )
WritingElement_ReadAttributes_End( oReader )
......
Common/DocxFormat/Source/DocxFormat/Logic/Annotations.h
View file @ a7f066d9
......@@ -240,30 +240,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oID.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oID->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T("/>");
......@@ -389,30 +389,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oID.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oID->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T("/>");
......@@ -536,30 +536,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oID.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oID->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T("/>");
......@@ -685,30 +685,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oID.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oID->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T("/>");
......
Common/DocxFormat/Source/DocxFormat/Logic/FldChar.h
View file @ a7f066d9
#pragma once
#pragma once
#ifndef OOX_LOGIC_FLD_CHAR_INCLUDE_H_
#define OOX_LOGIC_FLD_CHAR_INCLUDE_H_
......@@ -42,9 +42,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -53,7 +53,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -96,16 +96,16 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oType.IsInit() )
{
sResult += "w:type=\"";
sResult += _T("w:type=\"");
sResult += m_oType->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -114,7 +114,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:type"), m_oType )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:val"), m_oVal )
......@@ -158,9 +158,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -169,7 +169,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -212,16 +212,16 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oType.IsInit() )
{
sResult += "w:type=\"";
sResult += _T("w:type=\"");
sResult += m_oType->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -230,7 +230,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:type"), m_oType )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:val"), m_oVal )
......@@ -274,9 +274,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -285,7 +285,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -809,7 +809,7 @@ namespace OOX
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:dirty"), m_oDirty )
......
Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.cpp
View file @ a7f066d9
......@@ -78,30 +78,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......
Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
View file @ a7f066d9
#pragma once
#pragma once
#include "../WritingElement.h"
#include "../../Base/Nullable.h"
#include "../../Common/SimpleTypes_Word.h"
#include "../../Common/ComplexTypes.h"
// 2. CRuby 17.3.3.25
// 2. Класс CRuby 17.3.3.25
namespace OOX
{
......@@ -125,9 +125,9 @@ namespace OOX
if ( m_oId.IsInit() )
{
sResult += "r:id=\"";
sResult += _T("r:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(" />");
......
Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.cpp
View file @ a7f066d9
......@@ -69,30 +69,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......
Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h
View file @ a7f066d9
......@@ -47,37 +47,37 @@ namespace ComplexTypes
if ( m_oCombine.IsInit() )
{
sResult += "w:combine=\"";
sResult += _T("w:combine=\"");
sResult += m_oCombine->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oCombineBrackets.IsInit() )
{
sResult += "w:combineBrackets=\"";
sResult += _T("w:combineBrackets=\"");
sResult += m_oCombineBrackets->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oID.IsInit() )
{
sResult += "w:themeTint=\"";
sResult += _T("w:themeTint=\"");
sResult += m_oID->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oVert.IsInit() )
{
sResult += "w:vert=\"";
sResult += _T("w:vert=\"");
sResult += m_oVert->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oVertCompress.IsInit() )
{
sResult += "w:vertCompress=\"";
sResult += _T("w:vertCompress=\"");
sResult += m_oVert->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -136,9 +136,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -190,9 +190,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -245,16 +245,16 @@ namespace ComplexTypes
if ( m_oID.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oID->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -308,9 +308,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -369,65 +369,65 @@ namespace ComplexTypes
if ( m_sAscii.IsInit() )
{
sResult += "w:ascii=\"";
sResult += _T("w:ascii=\"");
sResult += m_sAscii->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oAsciiTheme.IsInit() )
{
sResult += "w:asciiTheme=\"";
sResult += _T("w:asciiTheme=\"");
sResult += m_oAsciiTheme->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sCs.IsInit() )
{
sResult += "w:cs=\"";
sResult += _T("w:cs=\"");
sResult += m_sCs->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oCsTheme.IsInit() )
{
sResult += "w:cstheme=\"";
sResult += _T("w:cstheme=\"");
sResult += m_oCsTheme->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sEastAsia.IsInit() )
{
sResult += "w:eastAsia=\"";
sResult += _T("w:eastAsia=\"");
sResult += m_sEastAsia->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oEastAsiaTheme.IsInit() )
{
sResult += "w:eastAsiaTheme=\"";
sResult += _T("w:eastAsiaTheme=\"");
sResult += m_oEastAsiaTheme->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sHAnsi.IsInit() )
{
sResult += "w:hAnsi=\"";
sResult += _T("w:hAnsi=\"");
sResult += m_sHAnsi->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oHAnsiTheme.IsInit() )
{
sResult += "w:hAnsiTheme=\"";
sResult += _T("w:hAnsiTheme=\"");
sResult += m_oHAnsiTheme->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oHint.IsInit() )
{
sResult += "w:hint=\"";
sResult += _T("w:hint=\"");
sResult += m_oHint->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -499,37 +499,37 @@ namespace ComplexTypes
if ( m_oColor.IsInit() )
{
sResult += "w:color=\"";
sResult += _T("w:color=\"");
sResult += m_oColor->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oThemeColor.IsInit() )
{
sResult += "w:themeColor=\"";
sResult += _T("w:themeColor=\"");
sResult += m_oThemeColor->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oThemeShade.IsInit() )
{
sResult += "w:themeShade=\"";
sResult += _T("w:themeShade=\"");
sResult += m_oThemeShade->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oThemeTint.IsInit() )
{
sResult += "w:themeTint=\"";
sResult += _T("w:themeTint=\"");
sResult += m_oThemeTint->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -587,9 +587,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -639,9 +639,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......
Common/DocxFormat/Source/DocxFormat/Logic/Sdt.h
View file @ a7f066d9
#pragma once
#pragma once
#ifndef OOX_LOGIC_SDT_INCLUDE_H_
#define OOX_LOGIC_SDT_INCLUDE_H_
......@@ -41,16 +41,16 @@ namespace ComplexTypes
if ( m_sDisplayText.IsInit() )
{
sResult += "w:displayText=\"";
sResult += _T("w:displayText=\"");
sResult += m_sDisplayText->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sValue.IsInit() )
{
sResult += "w:value=\"";
sResult += _T("w:value=\"");
sResult += m_sValue->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -60,7 +60,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:displayText"), m_sDisplayText )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:value"), m_sValue )
......@@ -106,23 +106,23 @@ namespace ComplexTypes
if ( m_sPrefixMappings.IsInit() )
{
sResult += "w:prefixMappings=\"";
sResult += _T("w:prefixMappings=\"");
sResult += m_sPrefixMappings->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sStoreItemID.IsInit() )
{
sResult += "w:storeItemID=\"";
sResult += _T("w:storeItemID=\"");
sResult += m_sStoreItemID->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sXPath.IsInit() )
{
sResult += "w:xpath=\"";
sResult += _T("w:xpath=\"");
sResult += m_sXPath->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -131,7 +131,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:prefixMappings"), m_sPrefixMappings )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:storeItemID"), m_sStoreItemID )
......@@ -183,7 +183,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -231,7 +231,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -279,7 +279,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -327,7 +327,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:multiLine"), m_oMultiLine )
WritingElement_ReadAttributes_End( oReader )
......@@ -442,7 +442,7 @@ namespace OOX
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:lastValue"), m_sLastValue )
WritingElement_ReadAttributes_End( oReader )
......@@ -537,7 +537,7 @@ namespace OOX
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:fullDate"), m_oFullDate )
WritingElement_ReadAttributes_End( oReader )
......@@ -717,7 +717,7 @@ namespace OOX
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:lastValue"), m_sLastValue )
WritingElement_ReadAttributes_End( oReader )
......
Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.cpp
View file @ a7f066d9
......@@ -64,30 +64,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......
Common/DocxFormat/Source/DocxFormat/Logic/Table.cpp
View file @ a7f066d9
......@@ -84,9 +84,9 @@ namespace OOX
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......@@ -175,30 +175,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......
Common/DocxFormat/Source/DocxFormat/Logic/Table.h
View file @ a7f066d9
......@@ -41,9 +41,9 @@ namespace ComplexTypes
if ( m_oW.IsInit() )
{
sResult += "w:w=\"";
sResult += _T("w:w=\"");
sResult += m_oW->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......
Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.cpp
View file @ a7f066d9
......@@ -76,30 +76,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......@@ -203,30 +203,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......@@ -332,30 +332,30 @@ namespace OOX
if ( m_sAuthor.IsInit() )
{
sResult += "w:author=\"";
sResult += _T("w:author=\"");
sResult += m_sAuthor->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += "w:date=\"";
sResult += _T("w:date=\"");
sResult += m_oDate->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += "w:id=\"";
sResult += _T("w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += "oouserid=\"";
sResult += _T("oouserid=\"");
sResult += m_sUserId->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
sResult += _T(">");
......
Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.h
View file @ a7f066d9
......@@ -42,9 +42,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -94,9 +94,9 @@ namespace ComplexTypes
if ( m_oType.IsInit() )
{
sResult += "w:type=\"";
sResult += _T("w:type=\"");
sResult += m_oType->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -152,44 +152,44 @@ namespace ComplexTypes
if ( m_oFirstColumn.IsInit() )
{
sResult += "w:firstColumn=\"";
sResult += _T("w:firstColumn=\"");
sResult += m_oFirstColumn->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oFirstRow.IsInit() )
{
sResult += "w:firstRow=\"";
sResult += _T("w:firstRow=\"");
sResult += m_oFirstRow->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oLastColumn.IsInit() )
{
sResult += "w:lastColumn=\"";
sResult += _T("w:lastColumn=\"");
sResult += m_oLastColumn->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oLastRow.IsInit() )
{
sResult += "w:lastRow=\"";
sResult += _T("w:lastRow=\"");
sResult += m_oLastRow->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oNoHBand.IsInit() )
{
sResult += "w:noHBand=\"";
sResult += _T("w:noHBand=\"");
sResult += m_oNoHBand->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oNoVBand.IsInit() )
{
sResult += "w:noVBand=\"";
sResult += _T("w:noVBand=\"");
sResult += m_oNoVBand->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
ComplexTypes_WriteAttribute( _T("w:val=\""), m_oVal );
......@@ -370,9 +370,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "w:val=\"";
sResult += _T("w:val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......
Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
View file @ a7f066d9
......@@ -2415,43 +2415,43 @@ namespace OOX
{
CString sResult;
sResult += "<w:del";
sResult += _T("<w:del");
if ( m_sAuthor.IsInit() )
{
sResult += " w:author=\"";
sResult += _T(" w:author=\"");
sResult += XmlUtils::EncodeXmlString(m_sAuthor->GetString());
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += " w:date=\"";
sResult += _T(" w:date=\"");
sResult += XmlUtils::EncodeXmlString(m_oDate->ToString());
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += " w:id=\"";
sResult += _T(" w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += " oouserid=\"";
sResult += _T(" oouserid=\"");
sResult += XmlUtils::EncodeXmlString(m_sUserId->GetString());
sResult += "\" ";
sResult += _T("\" ");
}
sResult += ">";
sResult += _T(">");
if(m_oRun.IsInit())
{
sResult += m_oRun->toXMLInner();
}
sResult += "</w:del>";
sResult += _T("</w:del>");
return sResult;
}
......@@ -2503,36 +2503,36 @@ namespace OOX
{
CString sResult;
sResult += "<w:ins";
sResult += _T("<w:ins");
if ( m_sAuthor.IsInit() )
{
sResult += " w:author=\"";
sResult += _T(" w:author=\"");
sResult += XmlUtils::EncodeXmlString(m_sAuthor->GetString());
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oDate.IsInit() )
{
sResult += " w:date=\"";
sResult += _T(" w:date=\"");
sResult += XmlUtils::EncodeXmlString(m_oDate->ToString());
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_oId.IsInit() )
{
sResult += " w:id=\"";
sResult += _T(" w:id=\"");
sResult += m_oId->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
if ( m_sUserId.IsInit() )
{
sResult += " oouserid=\"";
sResult += _T(" oouserid=\"");
sResult += XmlUtils::EncodeXmlString(m_sUserId->GetString());
sResult += "\" ";
sResult += _T("\" ");
}
sResult += ">";
sResult += _T(">");
if(m_oRun.IsInit())
{
......
Common/DocxFormat/Source/XlsxFormat/ComplexTypes_Spreadsheet.h
View file @ a7f066d9
#pragma once
#pragma once
#include "../Common/ComplexTypes.h"
#include "SimpleTypes_Spreadsheet.h"
......@@ -25,7 +25,7 @@ namespace ComplexTypes
}
virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -34,9 +34,9 @@ namespace ComplexTypes
{
CString sResult;
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal.ToString();
sResult += "\" ";
sResult += _T("\" ");
return sResult;
}
......@@ -79,9 +79,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -90,7 +90,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -127,9 +127,9 @@ namespace ComplexTypes
if ( m_sVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_sVal->GetString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -147,7 +147,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_sVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -185,9 +185,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -196,7 +196,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -234,9 +234,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -245,7 +245,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -283,9 +283,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -294,7 +294,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -332,9 +332,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -343,7 +343,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -381,9 +381,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -392,7 +392,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -430,9 +430,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -441,7 +441,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -479,9 +479,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -490,7 +490,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......@@ -528,9 +528,9 @@ namespace ComplexTypes
if ( m_oVal.IsInit() )
{
sResult += "val=\"";
sResult += _T("val=\"");
sResult += m_oVal->ToString();
sResult += "\" ";
sResult += _T("\" ");
}
return sResult;
......@@ -539,7 +539,7 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
//
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("val"), m_oVal )
WritingElement_ReadAttributes_End( oReader )
......
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