Skip to content

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

temporary reverted for win build 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58138 954022d7-b5bf-4e40-9824-e11837661b57
parent aafe0f87
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingParagraph.h
View file @ a317b307
...@@ -68,7 +68,7 @@ namespace OOX ...@@ -68,7 +68,7 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() ) while( !wsName.IsNull() )
{ {
if ( _T("xml:space") == wsName ) if ( _T("xml:space") == wsName )
...@@ -126,7 +126,7 @@ namespace OOX ...@@ -126,7 +126,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth(); int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) ) while( oReader.ReadNextSiblingNode( nParentDepth ) )
{ {
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
if ( _T("a:blipFill") == sName ) if ( _T("a:blipFill") == sName )
{ {
...@@ -311,7 +311,7 @@ namespace OOX ...@@ -311,7 +311,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth(); int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) ) while( oReader.ReadNextSiblingNode( nParentDepth ) )
{ {
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
if ( _T("a:rPr") == sName ) if ( _T("a:rPr") == sName )
m_oRunProperty= new CRunProperty( oReader ); m_oRunProperty= new CRunProperty( oReader );
else if ( _T("a:t") == sName ) else if ( _T("a:t") == sName )
...@@ -370,7 +370,7 @@ namespace OOX ...@@ -370,7 +370,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth(); int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) ) while( oReader.ReadNextSiblingNode( nParentDepth ) )
{ {
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
if ( _T("a:rPr") == sName ) if ( _T("a:rPr") == sName )
m_oRunProperty = oReader; m_oRunProperty = oReader;
...@@ -427,7 +427,7 @@ namespace OOX ...@@ -427,7 +427,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth(); int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) ) while( oReader.ReadNextSiblingNode( nParentDepth ) )
{ {
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
if ( _T("a:extLst") == sName ) if ( _T("a:extLst") == sName )
m_oExtLst = oReader; m_oExtLst = oReader;
...@@ -531,7 +531,7 @@ namespace OOX ...@@ -531,7 +531,7 @@ namespace OOX
int nParentDepth = oReader.GetDepth(); int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) ) while( oReader.ReadNextSiblingNode( nParentDepth ) )
{ {
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
WritingElement *pItem = NULL; WritingElement *pItem = NULL;
if ( _T("a:pPr") == sName ) if ( _T("a:pPr") == sName )
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingRun.h
View file @ a317b307
...@@ -37,7 +37,7 @@ namespace OOX ...@@ -37,7 +37,7 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{ {
m_eType = et_Unknown; m_eType = et_Unknown;
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
if ( _T("a:cs") == sName ) if ( _T("a:cs") == sName )
m_eType = et_a_cs; m_eType = et_a_cs;
else if ( _T("a:ea") == sName ) else if ( _T("a:ea") == sName )
...@@ -99,7 +99,7 @@ namespace OOX ...@@ -99,7 +99,7 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() ) while( !wsName.IsNull() )
{ {
wchar_t wsChar0 = wsName[0]; wchar_t wsChar0 = wsName[0];
...@@ -142,4 +142,4 @@ namespace OOX ...@@ -142,4 +142,4 @@ namespace OOX
} // namespace Logic } // namespace Logic
} // namespace OOX } // namespace OOX
#endif // OOX_LOGIC_DRAWING_RUN_INCLUDE_H_ #endif // OOX_LOGIC_DRAWING_RUN_INCLUDE_H_
\ No newline at end of file
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingTextProperties.h
View file @ a317b307
...@@ -109,7 +109,7 @@ namespace OOX ...@@ -109,7 +109,7 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsNull() ) while( !wsName.IsNull() )
{ {
wchar_t wsChar0 = wsName[0]; wchar_t wsChar0 = wsName[0];
...@@ -211,7 +211,7 @@ namespace OOX ...@@ -211,7 +211,7 @@ namespace OOX
int nCurDepth = oReader.GetDepth(); int nCurDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nCurDepth ) ) while ( oReader.ReadNextSiblingNode( nCurDepth ) )
{ {
CString sName = oReader.GetName(); CWCharWrapper sName = oReader.GetName();
if ( _T("a:extLst") == sName ) if ( _T("a:extLst") == sName )
m_oExtLst = oReader; m_oExtLst = oReader;
......
Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
View file @ a317b307
...@@ -70,8 +70,8 @@ namespace OOX ...@@ -70,8 +70,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("w:type") == wsName ) if ( _T("w:type") == wsName )
m_oType = oReader.GetText(); m_oType = oReader.GetText();
...@@ -149,12 +149,12 @@ namespace OOX ...@@ -149,12 +149,12 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("r:id") == wsName ) if ( _T("r:id") == wsName )
{ {
m_oId = oReader.GetText().c_str(); m_oId = oReader.GetText();
break; break;
} }
...@@ -327,8 +327,8 @@ namespace OOX ...@@ -327,8 +327,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("xml:space") == wsName ) if ( _T("xml:space") == wsName )
{ {
...@@ -565,8 +565,8 @@ namespace OOX ...@@ -565,8 +565,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("w:alignment") == wsName ) if ( _T("w:alignment") == wsName )
m_oAlignment = oReader.GetText(); m_oAlignment = oReader.GetText();
...@@ -710,8 +710,8 @@ namespace OOX ...@@ -710,8 +710,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("w:char") == wsName ) if ( _T("w:char") == wsName )
m_oChar = oReader.GetText(); m_oChar = oReader.GetText();
...@@ -791,8 +791,8 @@ namespace OOX ...@@ -791,8 +791,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("xml:space") == wsName ) if ( _T("xml:space") == wsName )
{ {
...@@ -1002,8 +1002,8 @@ namespace OOX ...@@ -1002,8 +1002,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("w:id") == wsName ) if ( _T("w:id") == wsName )
{ {
...@@ -1115,8 +1115,8 @@ namespace OOX ...@@ -1115,8 +1115,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("xml:space") == wsName ) if ( _T("xml:space") == wsName )
{ {
...@@ -1226,8 +1226,8 @@ namespace OOX ...@@ -1226,8 +1226,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("w:customMarkFollows") == wsName ) if ( _T("w:customMarkFollows") == wsName )
m_oCustomMarkFollows = oReader.GetText(); m_oCustomMarkFollows = oReader.GetText();
...@@ -1335,8 +1335,8 @@ namespace OOX ...@@ -1335,8 +1335,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("w:customMarkFollows") == wsName ) if ( _T("w:customMarkFollows") == wsName )
m_oCustomMarkFollows = oReader.GetText(); m_oCustomMarkFollows = oReader.GetText();
...@@ -1416,8 +1416,8 @@ namespace OOX ...@@ -1416,8 +1416,8 @@ namespace OOX
if ( !oReader.MoveToFirstAttribute() ) if ( !oReader.MoveToFirstAttribute() )
return; return;
CString wsName = oReader.GetName(); CWCharWrapper wsName = oReader.GetName();
while( !wsName.IsEmpty() ) while( !wsName.IsNull() )
{ {
if ( _T("xml:space") == wsName ) if ( _T("xml:space") == wsName )
{ {
...@@ -1477,4 +1477,4 @@ namespace OOX ...@@ -1477,4 +1477,4 @@ namespace OOX
} // Logic } // Logic
} // OOX } // OOX
\ No newline at end of file
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View file @ a317b307
...@@ -66,17 +66,17 @@ namespace OOX ...@@ -66,17 +66,17 @@ namespace OOX
#define WritingElement_ReadAttributes_Read_if(Reader, AttrName, Value) \ #define WritingElement_ReadAttributes_Read_if(Reader, AttrName, Value) \
if ( AttrName == wsName )\ if ( AttrName == wsName )\
{\ {\
Value = Reader.GetText().c_str();\ Value = Reader.GetText();\
} }
#define WritingElement_ReadAttributes_Read_else_if(Reader, AttrName, Value) \ #define WritingElement_ReadAttributes_Read_else_if(Reader, AttrName, Value) \
else if ( AttrName == wsName )\ else if ( AttrName == wsName )\
Value = Reader.GetText().c_str(); Value = Reader.GetText();
#define WritingElement_ReadAttributes_ReadSingle(Reader, AttrName, Value) \ #define WritingElement_ReadAttributes_ReadSingle(Reader, AttrName, Value) \
if ( AttrName == wsName )\ if ( AttrName == wsName )\
{\ {\
Value = Reader.GetText().c_str();\ Value = Reader.GetText();\
break;\ break;\
} }
......
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