Skip to content

O
onlyoffice_core
Commit aafe0f87 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

wstring wrapper to CString 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58137 954022d7-b5bf-4e40-9824-e11837661b57
parent e7c43482
Expand all Show whitespace changes
Inline Side-by-side
Showing with 291 additions and 265 deletions
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
View file @ aafe0f87
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-08-27T19:09:21. -->
<!-- Written by QtCreator 3.1.1, 2014-09-05T19:17:40. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......
Common/DocxFormat/Source/Base/ASCString.h
View file @ aafe0f87
......@@ -4171,13 +4171,13 @@ struct StdStringEqualsNoCaseA
#ifndef _WIN32
#ifdef UNICODE
typedef CStdStringW CStringW;
typedef CStdStringA CStringA;
#ifdef UNICODE
typedef CStringW CString;
typedef CStringW BSTR;
#define __T(x) L ## x
#else // UNICODE
typedef CStdStringA CStringA;
typedef CStringA CString;
#define __T(x) x
#endif // UNICODE
......
Common/DocxFormat/Source/Common/Encoding.h
View file @ aafe0f87
......@@ -8,37 +8,37 @@ class Encoding
{
public:
static __forceinline const CStringA Encoding::ansi2utf8 (const CStringA &sLine)
static AVSINLINE const CStringA Encoding::ansi2utf8 (const CStringA &sLine)
{
return wstring2string( string2wstring( sLine, CP_ACP ), CP_UTF8 );
}
static __forceinline const CStringW Encoding::ansi2unicode (const CStringA &sLine)
static AVSINLINE const CStringW Encoding::ansi2unicode (const CStringA &sLine)
{
return string2wstring( sLine, CP_ACP );
}
static __forceinline const CStringA Encoding::utf82ansi (const CStringA &sLine)
static AVSINLINE const CStringA Encoding::utf82ansi (const CStringA &sLine)
{
return wstring2string( string2wstring( sLine, CP_UTF8 ), CP_ACP );
}
static __forceinline const CStringW Encoding::utf82unicode (const CStringA &sLine)
static AVSINLINE const CStringW Encoding::utf82unicode (const CStringA &sLine)
{
return string2wstring( sLine, CP_UTF8 );
}
static __forceinline const CStringA Encoding::unicode2ansi (const CStringW &sLine)
static AVSINLINE const CStringA Encoding::unicode2ansi (const CStringW &sLine)
{
return wstring2string( sLine, CP_ACP );
}
static __forceinline const CStringA Encoding::unicode2utf8 (const CStringW &sLine)
static AVSINLINE const CStringA Encoding::unicode2utf8 (const CStringW &sLine)
{
return wstring2string( sLine, CP_UTF8 );
}
......@@ -47,7 +47,7 @@ public:
private:
static __forceinline const CStringA Encoding::wstring2string(const CStringW &sLine, const unsigned int unCodePage)
static AVSINLINE const CStringA Encoding::wstring2string(const CStringW &sLine, const unsigned int unCodePage)
{
const int nSize = WideCharToMultiByte( unCodePage, 0, sLine.GetString(), sLine.GetLength(), NULL, 0, NULL, NULL );
char *sTemp = new char[nSize];
......@@ -63,7 +63,7 @@ private:
}
static __forceinline const CStringW Encoding::string2wstring(const CStringA &sLine, const unsigned int unCodePage)
static AVSINLINE const CStringW Encoding::string2wstring(const CStringA &sLine, const unsigned int unCodePage)
{
const int nSize = MultiByteToWideChar( unCodePage, 0, sLine.GetString(), sLine.GetLength(), NULL, 0 );
......
Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h
View file @ aafe0f87
......@@ -4838,9 +4838,17 @@ namespace SimpleTypes
}
#ifndef _WIN32
static DWORD GetSysColor(const int nIndex)
{
// get color values from any windows theme
return 0;
}
#endif
void SetRGBASys(int nIndex)
{
DWORD dwRGB = ::GetSysColor(nIndex);
DWORD dwRGB = GetSysColor(nIndex);
m_unB = static_cast<unsigned char>(dwRGB & 0xFF);
m_unG = static_cast<unsigned char>((dwRGB & 0xFF00)>>8);
......
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ aafe0f87
......@@ -2526,6 +2526,31 @@ namespace SimpleTypes
hexcolorRGB = 1
};
//--------------------------------------------------------------------------------
// HighlightColor 17.18.40 (Part 1)
//--------------------------------------------------------------------------------
enum EHighlightColor
{
highlightcolorBlack = 0,
highlightcolorBlue = 1,
highlightcolorCyan = 2,
highlightcolorDarkBlue = 3,
highlightcolorDarkCyan = 4,
highlightcolorDarkGray = 5,
highlightcolorDarkGreen = 6,
highlightcolorDarkMagenta = 7,
highlightcolorDarkRed = 8,
highlightcolorDarkYellow = 9,
highlightcolorGreen = 10,
highlightcolorLightGray = 11,
highlightcolorMagenta = 12,
highlightcolorNone = 13,
highlightcolorRed = 14,
highlightcolorWhite = 15,
highlightcolorYellow = 16
};
template<EHexColor eDefValue = hexcolorAuto>
class CHexColor : public CSimpleType<EHexColor, eDefValue>
{
......@@ -2544,13 +2569,21 @@ namespace SimpleTypes
m_unB = b;
}
//template <>
//class CHighlightColor;
//template<EHighlightColor>
//class CHighlightColor;
virtual EHexColor FromString(CString &sValue)
{
if ( _T("auto") == sValue || _T("none") == sValue )
this->m_eValue = hexcolorAuto;
else
{
/*
// , , word .
//CHighlightColor<highlightcolorNone> oHighlightColor(sValue);
CHighlightColor<> oHighlightColor(sValue);
if(SimpleTypes::highlightcolorNone != oHighlightColor.GetValue())
{
......@@ -2572,6 +2605,7 @@ namespace SimpleTypes
Parse3();
}
else this->m_eValue = eDefValue;
*/
}
return this->m_eValue;
......@@ -2706,26 +2740,7 @@ namespace SimpleTypes
// HighlightColor 17.18.40 (Part 1)
//--------------------------------------------------------------------------------
enum EHighlightColor
{
highlightcolorBlack = 0,
highlightcolorBlue = 1,
highlightcolorCyan = 2,
highlightcolorDarkBlue = 3,
highlightcolorDarkCyan = 4,
highlightcolorDarkGray = 5,
highlightcolorDarkGreen = 6,
highlightcolorDarkMagenta = 7,
highlightcolorDarkRed = 8,
highlightcolorDarkYellow = 9,
highlightcolorGreen = 10,
highlightcolorLightGray = 11,
highlightcolorMagenta = 12,
highlightcolorNone = 13,
highlightcolorRed = 14,
highlightcolorWhite = 15,
highlightcolorYellow = 16
};
template<EHighlightColor eDefValue = highlightcolorNone>
class CHighlightColor : public CSimpleType<EHighlightColor, eDefValue>
......
Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h
View file @ aafe0f87
......@@ -50,7 +50,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:extLst") == sName )
m_oExtLst = oReader;
else if ( _T("a:graphicFrameLocks") == sName )
......@@ -180,7 +180,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:align") == sName )
{
m_oAlign = oReader.GetText2().GetString();
......@@ -278,7 +278,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:align") == sName )
{
m_oAlign = oReader.GetText2().GetString();
......@@ -407,7 +407,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:effectExtents") == sName )
m_oEffectExtent = oReader;
}
......@@ -499,7 +499,7 @@ namespace OOX
bool bStart = false;
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:start") == sName )
{
m_oStart = oReader;
......@@ -583,7 +583,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:wrapPolygon") == sName )
m_oWrapPolygon = oReader;
}
......@@ -660,7 +660,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:wrapPolygon") == sName )
m_oWrapPolygon = oReader;
}
......@@ -737,7 +737,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:effectExtent") == sName )
m_oEffectExtent = oReader;
}
......@@ -825,7 +825,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:cNvGraphicFramePr") == sName )
m_oCNvGraphicFramePr = oReader;
else if ( _T("wp:docPr") == sName )
......@@ -1073,7 +1073,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:cNvGraphicFramePr") == sName )
m_oCNvGraphicFramePr = oReader;
else if ( _T("wp:docPr") == sName )
......@@ -1356,7 +1356,7 @@ namespace OOX
int nCurDepth = pReader->GetDepth();
while( pReader->ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = pReader->GetName();
CString sName = pReader->GetName();
if ( _T("wp:inline") == sName )
{
m_oInline = *pReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingEffects.cpp
View file @ aafe0f87
......@@ -61,7 +61,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pEffect = NULL;
......@@ -193,7 +193,7 @@ namespace OOX
void CBlipFillProperties::fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:blipFill") == sName )
m_eType = et_a_blipFill;
else if ( _T("pic:blipFill") == sName )
......@@ -210,7 +210,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:blip") == sName )
m_oBlip = oReader;
else if ( _T("a:srcRect") == sName )
......@@ -336,7 +336,7 @@ namespace OOX
}
void CEffectContainer::fromXML(XmlUtils::CXmlLiteReader& oReader)
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cont") == sName )
m_eType = et_a_cont;
else if ( _T("a:effectDag") == sName )
......@@ -579,7 +579,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
wchar_t wChar = sName[2]; // a:_
WritingElement* pEffect = NULL;
......@@ -680,7 +680,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:gsLst") == sName )
m_oGsLst = oReader;
else if ( _T("a:lin") == sName )
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingGraphic.h
View file @ aafe0f87
......@@ -60,7 +60,7 @@ namespace OOX
int nGraphicDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nGraphicDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:graphicData") == sName )
{
// 20.1.2.2.17 graphicData (Graphic Object Data)
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingParagraph.h
View file @ aafe0f87
......@@ -68,7 +68,7 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
CString wsName = oReader.GetName();
while( !wsName.IsNull() )
{
if ( _T("xml:space") == wsName )
......@@ -126,7 +126,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:blipFill") == sName )
{
......@@ -311,7 +311,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:rPr") == sName )
m_oRunProperty= new CRunProperty( oReader );
else if ( _T("a:t") == sName )
......@@ -370,7 +370,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:rPr") == sName )
m_oRunProperty = oReader;
......@@ -427,7 +427,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:extLst") == sName )
m_oExtLst = oReader;
......@@ -531,7 +531,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("a:pPr") == sName )
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingParagraphElements.h
View file @ aafe0f87
......@@ -38,7 +38,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
}
}
......@@ -91,7 +91,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
}
}
......@@ -147,7 +147,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:spcPct") == sName )
m_oLineSpacingPercent = oReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingPicture.h
View file @ aafe0f87
......@@ -36,7 +36,7 @@ namespace OOX
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("pic:nvPicPr") == sName )
m_eType = et_pic_nvPicPr;
else
......@@ -114,7 +114,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("pic:nvPicPr") == sName )
m_oNvPicPr = oReader;
else if ( _T("pic:blipFill") == sName )
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingRun.h
View file @ aafe0f87
......@@ -37,7 +37,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cs") == sName )
m_eType = et_a_cs;
else if ( _T("a:ea") == sName )
......@@ -99,7 +99,7 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
CString wsName = oReader.GetName();
while( !wsName.IsNull() )
{
wchar_t wsChar0 = wsName[0];
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingShape.h
View file @ aafe0f87
......@@ -47,7 +47,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
//if ( _T("a:cNvGrpSpPr") == sName )
// m_oCNvGroupSpPr = oReader;
......@@ -108,7 +108,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
sName = oReader.GetName();
if ( _T("a:spLocks") == sName )
......@@ -172,7 +172,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cNvSpPr") == sName )
m_oCNvSpPr = oReader;
......@@ -240,7 +240,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:spPr") == sName )
m_oSpPr = oReader;
......@@ -315,7 +315,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:grpSpPr") == sName )
m_oGroupSpPr = oReader;
......@@ -395,7 +395,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
}
}
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingStyles.h
View file @ aafe0f87
......@@ -46,7 +46,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
wchar_t wChar2 = sName[2];
switch ( wChar2 )
......@@ -201,7 +201,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("a:blipFill") == sName )
......@@ -335,7 +335,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:effectDag") == sName )
{
m_oEffectDag = oReader;
......@@ -434,7 +434,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:effectStyle") == sName )
{
OOX::Drawing::CEffectStyleItem *oEffectStyle = new OOX::Drawing::CEffectStyleItem(oReader);
......@@ -516,7 +516,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("a:blipFill") == sName )
......@@ -609,8 +609,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
wchar_t wsChar0 = wsName[0];
......@@ -666,7 +666,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:lnDef") == sName )
m_eType = et_a_lnDef;
else if ( _T("a:spDef") == sName )
......@@ -682,7 +682,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:bodyPr") == sName )
m_oBodyPr = oReader;
else if ( _T("a:extLst") == sName )
......@@ -779,7 +779,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:ln") == sName )
{
OOX::Drawing::CLineProperties *oLP = new OOX::Drawing::CLineProperties(oReader);
......@@ -846,7 +846,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:majorFont") == sName )
m_eType = et_a_majorFont;
else if ( _T("a:minorFont") == sName )
......@@ -860,7 +860,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cs") == sName )
m_oCs = oReader;
else if ( _T("a:ea") == sName )
......@@ -956,7 +956,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:bgFillStyleLst") == sName )
m_oBgFillStyleLst = oReader;
else if ( _T("a:effectStyleLst") == sName )
......@@ -996,8 +996,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("name") == wsName )
m_sName = oReader.GetText();
......@@ -1053,7 +1053,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:extLst") == sName )
m_oExtLst = oReader;
else if ( _T("a:majorFont") == sName )
......@@ -1092,8 +1092,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("name") == wsName )
m_sName = oReader.GetText();
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingText.h
View file @ aafe0f87
......@@ -49,7 +49,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:bodyPr") == sName )
m_oBodyPr = oReader;
......@@ -110,7 +110,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:txBody") == sName )
m_oTxBody = oReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingTextProperties.h
View file @ aafe0f87
......@@ -109,7 +109,7 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
CString wsName = oReader.GetName();
while( !wsName.IsNull() )
{
wchar_t wsChar0 = wsName[0];
......@@ -211,7 +211,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:extLst") == sName )
m_oExtLst = oReader;
......
Common/DocxFormat/Source/DocxFormat/Logic/FldChar.h
View file @ aafe0f87
......@@ -353,7 +353,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("w:checked") == sName )
m_oChecked = oReader;
else if ( _T("w:default") == sName )
......@@ -466,7 +466,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("w:default") == sName )
m_oDefault = oReader;
else if ( _T("w:result") == sName )
......@@ -561,7 +561,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("w:default") == sName )
m_oDefault = oReader;
else if ( _T("w:format") == sName )
......@@ -659,7 +659,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("w:calcOnExit") == sName ) m_oCalcOnExit = oReader;
else if ( _T("w:checkBox") == sName ) m_oCheckBox = oReader;
......@@ -773,7 +773,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("w:ffData") == sName )
......
Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
View file @ aafe0f87
......@@ -70,8 +70,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("w:type") == wsName )
m_oType = oReader.GetText();
......@@ -149,12 +149,12 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("r:id") == wsName )
{
m_oId = oReader.GetText();
m_oId = oReader.GetText().c_str();
break;
}
......@@ -327,8 +327,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("xml:space") == wsName )
{
......@@ -565,8 +565,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("w:alignment") == wsName )
m_oAlignment = oReader.GetText();
......@@ -710,8 +710,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("w:char") == wsName )
m_oChar = oReader.GetText();
......@@ -791,8 +791,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("xml:space") == wsName )
{
......@@ -1002,8 +1002,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("w:id") == wsName )
{
......@@ -1115,8 +1115,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("xml:space") == wsName )
{
......@@ -1226,8 +1226,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("w:customMarkFollows") == wsName )
m_oCustomMarkFollows = oReader.GetText();
......@@ -1335,8 +1335,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("w:customMarkFollows") == wsName )
m_oCustomMarkFollows = oReader.GetText();
......@@ -1416,8 +1416,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() )
return;
CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() )
CString wsName = oReader.GetName();
while( !wsName.IsEmpty() )
{
if ( _T("xml:space") == wsName )
{
......
Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h
View file @ aafe0f87
......@@ -871,7 +871,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("w:b") == sName )
......
Common/DocxFormat/Source/DocxFormat/Logic/Shape.h
View file @ aafe0f87
......@@ -104,7 +104,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("w:txbxContent") == sName )
m_oTxtbxContent = oReader;
......@@ -168,7 +168,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
sName = oReader.GetName();
if ( _T("a:spLocks") == sName )
......@@ -241,7 +241,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
sName = oReader.GetName();
if ( _T("a:extLst") == sName )
......@@ -314,7 +314,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
sName = oReader.GetName();
if ( _T("a:picLocks") == sName )
......@@ -386,7 +386,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wps:cNvSpPr") == sName )
m_oCNvSpPr = oReader;
......@@ -467,7 +467,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wpg:grpSpPr") == sName )
m_oGroupSpPr = oReader;
......@@ -544,7 +544,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
//if ( _T("wpg:grpSpPr") == sName )
// m_oGroupSpPr = oReader;
......
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View file @ aafe0f87
......@@ -65,16 +65,18 @@ namespace OOX
#define WritingElement_ReadAttributes_Read_if(Reader, AttrName, Value) \
if ( AttrName == wsName )\
Value = Reader.GetText();
{\
Value = Reader.GetText().c_str();\
}
#define WritingElement_ReadAttributes_Read_else_if(Reader, AttrName, Value) \
else if ( AttrName == wsName )\
Value = Reader.GetText();
Value = Reader.GetText().c_str();
#define WritingElement_ReadAttributes_ReadSingle(Reader, AttrName, Value) \
if ( AttrName == wsName )\
{\
Value = Reader.GetText();\
Value = Reader.GetText().c_str();\
break;\
}
......
Common/DocxFormat/Source/XlsxFormat/WritingElement.h
View file @ aafe0f87
#pragma once
//#include "NamespaceOwn.h"
#include "../XML/XmlUtils.h"
#include "atlstr.h"
//#include "../XML/XmlUtils.h"
//#include "atlstr.h"
namespace OOX
{
......
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