Skip to content

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

CWCharWrapper -> CString 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58031 954022d7-b5bf-4e40-9824-e11837661b57
parent 0f7ac7c4
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
Common/DocxFormat/Source/DocxFormat/Drawing/Drawing3D.h
View file @ 98a74c9e
......@@ -100,7 +100,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:norm") == sName )
m_eType = et_a_norm;
......@@ -186,7 +186,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:anchor") == sName )
m_oAnchor = oReader;
else if ( _T("a:extLst") == sName )
......@@ -251,7 +251,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:bevel") == sName )
m_eType = et_a_bevel;
......@@ -406,7 +406,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:rot") == sName )
m_oRot = oReader;
}
......@@ -630,7 +630,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:rot") == sName )
m_oRot = oReader;
......@@ -703,7 +703,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:bevelB") == sName )
m_oBevelB = oReader;
......@@ -784,4 +784,4 @@ namespace OOX
} // namespace Logic
} // namespace OOX
#endif // OOX_LOGIC_DRAWING_3D_INCLUDE_H_
\ No newline at end of file
#endif // OOX_LOGIC_DRAWING_3D_INCLUDE_H_
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingColors.h
View file @ 98a74c9e
......@@ -1494,7 +1494,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement *pTransform = NULL;
if ( _T("a:alpha") == sName )
......@@ -2479,7 +2479,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:hslClr") == sName )
{
m_oHslClr = oReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.cpp
View file @ 98a74c9e
......@@ -17,7 +17,7 @@ namespace OOX
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cNvPicPr") == sName )
m_eType = et_a_cNvPicPr;
else if ( _T("p:cNvPicPr") == sName )
......@@ -86,7 +86,7 @@ namespace OOX
ReadAttributes( oReader );
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("wp:docPr") == sName )
m_eType = et_wp_docPr;
......@@ -191,7 +191,7 @@ namespace OOX
void CHyperlink::fromXML(XmlUtils::CXmlLiteReader& oReader)
{
//
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:hlinkClick") == sName )
m_eType = et_a_hlinkClick;
else if ( _T("a:hlinkHover") == sName )
......@@ -206,7 +206,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:snd") == sName )
......@@ -271,4 +271,4 @@ namespace OOX
return sResult;
}
} // Drawing
} // OOX
\ No newline at end of file
} // OOX
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.h
View file @ 98a74c9e
......@@ -153,7 +153,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;
}
......@@ -308,7 +308,7 @@ namespace OOX
m_eDashType = linedashtypeUnknown;
m_eJoinType = linejointypeUnknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:ln") == sName )
m_eType = et_a_ln;
else
......@@ -582,7 +582,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;
......@@ -784,7 +784,7 @@ namespace OOX
m_eGeomType = geomtypeUnknown;
m_eEffectType = effecttypeUnknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:spPr") == sName )
m_eType = et_a_spPr;
else if ( _T("pic:spPr") == sName )
......@@ -1099,7 +1099,7 @@ namespace OOX
m_eFillType = filltypeUnknown;
m_eEffectType = effecttypeUnknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:grpSpPr") == sName )
m_eType = et_a_groupSpPr;
else if ( _T("xdr:grpSpPr") == sName )
......@@ -1237,7 +1237,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:effectRef") == sName )
m_oEffectRef = oReader;
else if ( _T("a:fillRef") == sName )
......@@ -1281,4 +1281,4 @@ namespace OOX
#endif // OOX_LOGIC_DRAWING_CORE_INFO_INCLUDE_H_
\ No newline at end of file
#endif // OOX_LOGIC_DRAWING_CORE_INFO_INCLUDE_H_
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingEffects.h
View file @ 98a74c9e
......@@ -358,7 +358,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cont") == sName )
m_oCont = oReader;
}
......@@ -703,7 +703,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cont") == sName )
m_oCont = oReader;
}
......@@ -1038,7 +1038,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:clrFrom") == sName )
m_oClrFrom = oReader;
else if ( _T("a:clrTo") == sName )
......@@ -1198,7 +1198,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:ds") == sName )
{
CDashStop oDs = oReader;
......@@ -1258,7 +1258,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:hslClr") == sName )
{
unsigned char unR = 0, unG = 0, unB = 0, unA = 255;
......@@ -1466,7 +1466,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:fillRect") == sName )
m_eType = et_a_fillRect;
else if ( _T("a:fillToRect") == sName )
......@@ -1831,7 +1831,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:gs") == sName )
{
CGradientStop oGs = oReader;
......@@ -1887,7 +1887,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:tailEnd") == sName )
m_eType = et_a_tailEnd;
else if ( _T("a:headEnd") == sName )
......@@ -2419,7 +2419,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:fillToRect") == sName )
m_oFillToRect = oReader;
}
......@@ -2499,7 +2499,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:bgClr") == sName )
m_oBgClr = oReader;
else if ( _T("a:fgClr") == sName )
......@@ -2996,7 +2996,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:fillRect") == sName )
m_oFillRect = oReader;
}
......@@ -3321,7 +3321,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:blipFill") == sName )
{
m_oBlipFill = oReader;
......@@ -3427,7 +3427,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:blipFill") == sName )
{
m_oBlipFill = oReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h
View file @ 98a74c9e
......@@ -103,7 +103,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:ext") == sName )
{
OOX::Drawing::COfficeArtExtension oExt = oReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingShapeElements.h
View file @ 98a74c9e
......@@ -41,7 +41,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:pos") == sName )
m_eType = et_a_pos;
......@@ -119,7 +119,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:pos") == sName )
m_oPos = oReader;
}
......@@ -241,7 +241,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:pos") == sName )
m_oPos = oReader;
}
......@@ -459,7 +459,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( 0 == nPtCount && _T("a:pt") == sName )
{
......@@ -532,7 +532,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:pos") == sName )
m_oPos = oReader;
......@@ -596,7 +596,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:cxn") == sName )
{
......@@ -705,7 +705,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:avLst") == sName )
m_eType = et_a_avLst;
......@@ -791,7 +791,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:pt") == sName )
m_oPt = oReader;
......@@ -843,7 +843,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:pt") == sName )
m_oPt = oReader;
......@@ -897,7 +897,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( 0 == nPtCount && _T("a:pt") == sName )
{
......@@ -991,7 +991,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement* pItem = NULL;
if ( _T("a:arcTo") == sName )
......@@ -1105,7 +1105,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:path") == sName )
{
......@@ -1182,7 +1182,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement* pElement = NULL;
......@@ -1265,7 +1265,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement* pItem = NULL;
if ( _T("a:avLst") == sName )
......@@ -1336,7 +1336,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
WritingElement* pItem = NULL;
if ( _T("a:avLst") == sName )
......@@ -1467,7 +1467,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:ahLst") == sName )
m_oAhLst = oReader;
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingStyles2.h
View file @ 98a74c9e
......@@ -100,7 +100,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nCurDepth ) )
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:backdrop") == sName )
m_oBackdrop = oReader;
else if ( _T("a:camera") == sName )
......@@ -168,7 +168,7 @@ namespace OOX
}
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:effectRef") == sName )
m_eType = et_a_effectRef;
else if ( _T("a:fillRef") == sName )
......@@ -233,4 +233,4 @@ namespace OOX
} // namespace OOX
#endif // OOX_LOGIC_DRAWING_STYLES_INCLUDE2_H_
\ No newline at end of file
#endif // OOX_LOGIC_DRAWING_STYLES_INCLUDE2_H_
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingTransform.h
View file @ 98a74c9e
......@@ -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:xfrm") == sName )
m_eType = et_a_xfrm;
else
......@@ -161,7 +161,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
m_eType = et_Unknown;
CWCharWrapper sName = oReader.GetName();
CString sName = oReader.GetName();
if ( _T("a:xfrm") == sName )
m_eType = et_a_xfrm;
else
......@@ -254,4 +254,4 @@ namespace OOX
} // namespace Logic
} // namespace OOX
#endif // OOX_LOGIC_DRAWING_TRANSFORM_INCLUDE_H_
\ No newline at end of file
#endif // OOX_LOGIC_DRAWING_TRANSFORM_INCLUDE_H_
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View file @ 98a74c9e
......@@ -50,8 +50,8 @@ namespace OOX
return;\
if ( !Reader.MoveToFirstAttribute() )\
return;\
CWCharWrapper wsName = Reader.GetName();\
while( !wsName.IsNull() )\
CString wsName = Reader.GetName();\
while( !wsName.IsEmpty() )\
{
#define WritingElement_ReadAttributes_Start_No_NS(Reader) \
......
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