pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Oleg Korshul
2022-08-04 19:51:59 +03:00
parent 92119b07b7
commit f0a65c6553
9 changed files with 217 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorBase.h
View File

@ -1,7 +1,6 @@
#ifndef CEMFINTERPRETATORBASE_H
#define CEMFINTERPRETATORBASE_H
#include "../../CXmlOutput.h"
#include "../../Common/IOutputDevice.h"
#include "../../Common/MetaFile.h"

1
DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorSvg.h
View File

@ -4,6 +4,7 @@
#include "../../Common/MetaFileUtils.h"
#include "CEmfInterpretatorBase.h"
#include "../EmfParser/CEmfParserBase.h"
#include "../../../../xml/include/xmlutils.h"
namespace MetaFile
{

1
DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorXml.h
View File

@ -2,6 +2,7 @@
#define CEMFINTERPRETATORXML_H
#include "CEmfInterpretatorBase.h"
#include "../../CXmlOutput.h"
#include <iostream>

3
DesktopEditor/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorSvg.h
View File

@ -1,10 +1,9 @@
#ifndef CWMFINTERPRETATORSVG_H
#define CWMFINTERPRETATORSVG_H
#include "../../CXmlOutput.h"
#include "../WmfParser/CWmfParserBase.h"
#include "CWmfInterpretatorBase.h"
#include "../../../../xml/include/xmlwriter.h"
namespace MetaFile
{

1
DesktopEditor/xml/build/qt/libxml2.pri
View File

@ -24,5 +24,6 @@ SOURCES += $$PWD/libxml2_all.c
SOURCES += $$PWD/libxml2_all2.c
SOURCES += \
$$PWD/../../src/xmlwriter.cpp \
$$PWD/../../src/xmllight.cpp \
$$PWD/../../src/xmldom.cpp

43
DesktopEditor/xml/include/xmlutils.h
View File

@ -32,20 +32,7 @@
#ifndef _BUILD_XMLUTILS_CROSSPLATFORM_H_
#define _BUILD_XMLUTILS_CROSSPLATFORM_H_
#include <vector>
#include <list>
#include <map>
#include <string>
#ifdef _MSC_VER
#pragma warning (disable: 4100 4189)
#endif
#include "../../common/StringBuilder.h"
#ifndef XML_UNUSED
#define XML_UNUSED( arg ) ( (arg) = (arg) )
#endif
#include "xmlwriter.h"
namespace XmlUtils
{
@ -269,34 +256,6 @@ namespace XmlUtils
std::wstring GetNameNoNS(const std::wstring& strNodeName);
};
class KERNEL_DECL CXmlWriter
{
private:
std::wstring m_str;
public:
CXmlWriter();
std::wstring GetXmlString();
void SetXmlString(const std::wstring& strValue);
bool SaveToFile(const std::wstring& strFilePath/*, bool bEncodingToUTF8 = false*/);
void WriteString(const std::wstring& strValue);
void WriteInteger(int Value);
void WriteDouble(double Value);
void WriteBoolean(bool Value);
void WriteNodeBegin(const std::wstring& strNodeName, bool bAttributed = false);
void WriteNodeEnd(const std::wstring& strNodeName, bool bEmptyNode = false, bool bEndNode = true);
void WriteNode(const std::wstring& strNodeName, const std::wstring& strNodeValue);
void WriteNode(const std::wstring& strNodeName, int nValue, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = L"");
void WriteNode(const std::wstring& strNodeName, double dValue);
void WriteAttribute(const std::wstring& strAttributeName, const std::wstring& strAttributeValue);
void WriteAttribute(const std::wstring& strAttributeName, int nValue, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = (L""));
void WriteAttribute(const std::wstring& strAttributeName, double dValue);
};
std::wstring KERNEL_DECL GetNameNoNS(const std::wstring & strNodeName);
KERNEL_DECL const char* GetNameNoNS(const char* strNodeName);
std::wstring KERNEL_DECL GetNamespace(const std::wstring& strNodeName);

79
DesktopEditor/xml/include/xmlwriter.h Normal file
View File

@ -0,0 +1,79 @@
/*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#ifndef _BUILD_XMLWRITER_CROSSPLATFORM_H_
#define _BUILD_XMLWRITER_CROSSPLATFORM_H_
#include <vector>
#include <list>
#include <map>
#ifdef _MSC_VER
#pragma warning (disable: 4100 4189)
#endif
#include "../../common/StringBuilder.h"
#ifndef XML_UNUSED
#define XML_UNUSED( arg ) ( (arg) = (arg) )
#endif
namespace XmlUtils
{
class KERNEL_DECL CXmlWriter
{
private:
std::wstring m_str;
public:
CXmlWriter();
std::wstring GetXmlString();
void SetXmlString(const std::wstring& strValue);
bool SaveToFile(const std::wstring& strFilePath/*, bool bEncodingToUTF8 = false*/);
void WriteString(const std::wstring& strValue);
void WriteInteger(int Value);
void WriteDouble(double Value);
void WriteBoolean(bool Value);
void WriteNodeBegin(const std::wstring& strNodeName, bool bAttributed = false);
void WriteNodeEnd(const std::wstring& strNodeName, bool bEmptyNode = false, bool bEndNode = true);
void WriteNode(const std::wstring& strNodeName, const std::wstring& strNodeValue);
void WriteNode(const std::wstring& strNodeName, int nValue, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = L"");
void WriteNode(const std::wstring& strNodeName, double dValue);
void WriteAttribute(const std::wstring& strAttributeName, const std::wstring& strAttributeValue);
void WriteAttribute(const std::wstring& strAttributeName, int nValue, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = (L""));
void WriteAttribute(const std::wstring& strAttributeName, double dValue);
};
}
#endif // _BUILD_XMLWRITER_CROSSPLATFORM_H_

100
DesktopEditor/xml/src/xmldom.cpp
View File

@ -898,106 +898,6 @@ namespace XmlUtils
}
}
namespace XmlUtils
{
CXmlWriter::CXmlWriter()
{
}
std::wstring CXmlWriter::GetXmlString()
{
return m_str;
}
void CXmlWriter::SetXmlString(const std::wstring& strValue)
{
m_str = strValue;
}
bool CXmlWriter::SaveToFile(const std::wstring& strFilePath/*, bool bEncodingToUTF8 = false*/)
{
return NSFile::CFileBinary::SaveToFile(strFilePath, m_str);
}
void CXmlWriter::WriteString(const std::wstring& strValue)
{
m_str += strValue;
}
void CXmlWriter::WriteInteger(int Value)
{
m_str += std::to_wstring(Value);
}
void CXmlWriter::WriteDouble(double Value)
{
m_str += std::to_wstring(Value);
}
void CXmlWriter::WriteBoolean(bool Value)
{
if (Value)
m_str += (L"true");
else
m_str += (L"false");
}
void CXmlWriter::WriteNodeBegin(const std::wstring& strNodeName, bool bAttributed)
{
m_str += (L"<") + strNodeName;
if (!bAttributed)
m_str += (L">");
}
void CXmlWriter::WriteNodeEnd(const std::wstring& strNodeName, bool bEmptyNode, bool bEndNode)
{
if (bEmptyNode)
{
if (bEndNode)
m_str += (L" />");
else
m_str += (L">");
}
else
m_str += (L"</") + strNodeName + (L">");
}
void CXmlWriter::WriteNode(const std::wstring& strNodeName, const std::wstring& strNodeValue)
{
if (strNodeValue.empty())
m_str += L"<" + strNodeName + L"/>";
else
m_str += L"<" + strNodeName + L">" + strNodeValue + L"</" + strNodeName + L">";
}
void CXmlWriter::WriteNode(const std::wstring& strNodeName, int nValue, const std::wstring& strTextBeforeValue, const std::wstring& strTextAfterValue)
{
WriteNodeBegin(strNodeName);
WriteString(strTextBeforeValue);
WriteInteger(nValue);
WriteString(strTextAfterValue);
WriteNodeEnd(strNodeName);
}
void CXmlWriter::WriteNode(const std::wstring& strNodeName, double dValue)
{
WriteNodeBegin(strNodeName);
WriteDouble(dValue);
WriteNodeEnd(strNodeName);
}
void CXmlWriter::WriteAttribute(const std::wstring& strAttributeName, const std::wstring& strAttributeValue)
{
m_str += L" " + strAttributeName + L"=\"" + strAttributeValue + L"\"";
}
void CXmlWriter::WriteAttribute(const std::wstring& strAttributeName, int nValue, const std::wstring& strTextBeforeValue, const std::wstring& strTextAfterValue)
{
WriteString(L" " + strAttributeName + L"=");
WriteString(L"\"");
WriteString(strTextBeforeValue);
WriteInteger(nValue);
WriteString(strTextAfterValue);
WriteString(L"\"");
}
void CXmlWriter::WriteAttribute(const std::wstring& strAttributeName, double dValue)
{
WriteString(L" " + strAttributeName + L"=");
WriteString(L"\"");
WriteDouble(dValue);
WriteString(L"\"");
}
}
namespace XmlUtils
{
class CXmlBuffer

133
DesktopEditor/xml/src/xmlwriter.cpp Normal file
View File

@ -0,0 +1,133 @@
/*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#include "../include/xmlwriter.h"
#include "../../common/File.h"
namespace XmlUtils
{
CXmlWriter::CXmlWriter()
{
}
std::wstring CXmlWriter::GetXmlString()
{
return m_str;
}
void CXmlWriter::SetXmlString(const std::wstring& strValue)
{
m_str = strValue;
}
bool CXmlWriter::SaveToFile(const std::wstring& strFilePath/*, bool bEncodingToUTF8 = false*/)
{
return NSFile::CFileBinary::SaveToFile(strFilePath, m_str);
}
void CXmlWriter::WriteString(const std::wstring& strValue)
{
m_str += strValue;
}
void CXmlWriter::WriteInteger(int Value)
{
m_str += std::to_wstring(Value);
}
void CXmlWriter::WriteDouble(double Value)
{
m_str += std::to_wstring(Value);
}
void CXmlWriter::WriteBoolean(bool Value)
{
if (Value)
m_str += (L"true");
else
m_str += (L"false");
}
void CXmlWriter::WriteNodeBegin(const std::wstring& strNodeName, bool bAttributed)
{
m_str += (L"<") + strNodeName;
if (!bAttributed)
m_str += (L">");
}
void CXmlWriter::WriteNodeEnd(const std::wstring& strNodeName, bool bEmptyNode, bool bEndNode)
{
if (bEmptyNode)
{
if (bEndNode)
m_str += (L" />");
else
m_str += (L">");
}
else
m_str += (L"</") + strNodeName + (L">");
}
void CXmlWriter::WriteNode(const std::wstring& strNodeName, const std::wstring& strNodeValue)
{
if (strNodeValue.empty())
m_str += L"<" + strNodeName + L"/>";
else
m_str += L"<" + strNodeName + L">" + strNodeValue + L"</" + strNodeName + L">";
}
void CXmlWriter::WriteNode(const std::wstring& strNodeName, int nValue, const std::wstring& strTextBeforeValue, const std::wstring& strTextAfterValue)
{
WriteNodeBegin(strNodeName);
WriteString(strTextBeforeValue);
WriteInteger(nValue);
WriteString(strTextAfterValue);
WriteNodeEnd(strNodeName);
}
void CXmlWriter::WriteNode(const std::wstring& strNodeName, double dValue)
{
WriteNodeBegin(strNodeName);
WriteDouble(dValue);
WriteNodeEnd(strNodeName);
}
void CXmlWriter::WriteAttribute(const std::wstring& strAttributeName, const std::wstring& strAttributeValue)
{
m_str += L" " + strAttributeName + L"=\"" + strAttributeValue + L"\"";
}
void CXmlWriter::WriteAttribute(const std::wstring& strAttributeName, int nValue, const std::wstring& strTextBeforeValue, const std::wstring& strTextAfterValue)
{
WriteString(L" " + strAttributeName + L"=");
WriteString(L"\"");
WriteString(strTextBeforeValue);
WriteInteger(nValue);
WriteString(strTextAfterValue);
WriteString(L"\"");
}
void CXmlWriter::WriteAttribute(const std::wstring& strAttributeName, double dValue)
{
WriteString(L" " + strAttributeName + L"=");
WriteString(L"\"");
WriteDouble(dValue);
WriteString(L"\"");
}
}