Skip to content

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

gcc build 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57994 954022d7-b5bf-4e40-9824-e11837661b57
parent d0f02341
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 32 deletions
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ 792b97ca
...@@ -580,7 +580,7 @@ namespace SimpleTypes ...@@ -580,7 +580,7 @@ namespace SimpleTypes
} }
} }
return this->m_eValuem_eValue; return this->m_eValue;
} }
virtual CString ToString () const virtual CString ToString () const
...@@ -2492,17 +2492,17 @@ namespace SimpleTypes ...@@ -2492,17 +2492,17 @@ namespace SimpleTypes
virtual EHeightRule FromString(CString &sValue) virtual EHeightRule FromString(CString &sValue)
{ {
if ( _T("atLeast") == sValue ) this->m_eValuethis->m_eValue = heightruleAtLeast; if ( _T("atLeast") == sValue ) this->m_eValue = heightruleAtLeast;
else if ( _T("auto") == sValue ) this->m_eValuethis->m_eValue = heightruleAuto; else if ( _T("auto") == sValue ) this->m_eValue = heightruleAuto;
else if ( _T("exact") == sValue ) this->m_eValuethis->m_eValue = heightruleExact; else if ( _T("exact") == sValue ) this->m_eValue = heightruleExact;
else this->m_eValuethis->m_eValue = eDefValue; else this->m_eValue = eDefValue;
return this->m_eValuem_eValue; return this->m_eValue;
} }
virtual CString ToString () const virtual CString ToString () const
{ {
switch(this->m_eValuem_eValue) switch(this->m_eValue)
{ {
case heightruleAtLeast : return _T("atLeast"); case heightruleAtLeast : return _T("atLeast");
case heightruleAuto : return _T("auto"); case heightruleAuto : return _T("auto");
...@@ -2561,7 +2561,7 @@ namespace SimpleTypes ...@@ -2561,7 +2561,7 @@ namespace SimpleTypes
} }
else if ( 6 <= sValue.GetLength() ) else if ( 6 <= sValue.GetLength() )
{ {
this->m_eValuethis->m_eValue = hexcolorRGB; this->m_eValue = hexcolorRGB;
m_sValue = sValue.Mid( 0, 6 ); m_sValue = sValue.Mid( 0, 6 );
Parse(); Parse();
} }
...@@ -2955,7 +2955,7 @@ namespace SimpleTypes ...@@ -2955,7 +2955,7 @@ namespace SimpleTypes
if ( _T("cs") == sValue ) this->m_eValue = hintCs; if ( _T("cs") == sValue ) this->m_eValue = hintCs;
else if ( _T("default") == sValue ) this->m_eValue = hintDefault; else if ( _T("default") == sValue ) this->m_eValue = hintDefault;
else if ( _T("eastAsia") == sValue ) this->m_eValue = hintEastAsia; else if ( _T("eastAsia") == sValue ) this->m_eValue = hintEastAsia;
else this-> this->m_eValue = eDefValue; else this->m_eValue = eDefValue;
return this->m_eValue; return this->m_eValue;
} }
......
Common/DocxFormat/Source/DocxFormat/Diagram/DiagramDrawing.h
View file @ 792b97ca
...@@ -118,7 +118,7 @@ namespace Diagram ...@@ -118,7 +118,7 @@ namespace Diagram
WritingElement *pItem = NULL; WritingElement *pItem = NULL;
if ( _T("dsp:sp") == sName ) if ( _T("dsp:sp") == sName )
m_arrItems.Add( new Diagram::CShape( oReader )); m_arrItems.push_back( new Diagram::CShape( oReader ));
//else if ( _T("dsp:nvGrpSpPr") == sName ) //else if ( _T("dsp:nvGrpSpPr") == sName )
// m_oGroupShapeNonVisual = oReader; // m_oGroupShapeNonVisual = oReader;
else if ( _T("dsp:grpSpPr") == sName ) else if ( _T("dsp:grpSpPr") == sName )
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingGraphic.h
View file @ 792b97ca
...@@ -76,37 +76,37 @@ namespace OOX ...@@ -76,37 +76,37 @@ namespace OOX
sName = oReader.GetName(); sName = oReader.GetName();
if ( _T("pic:pic") == sName ) if ( _T("pic:pic") == sName )
{ {
m_arrItems.Add( new OOX::Drawing::CPicture( oReader )); m_arrItems.push_back( new OOX::Drawing::CPicture( oReader ));
m_eGraphicType = graphictypePicture; m_eGraphicType = graphictypePicture;
} }
else if ( _T("c:chart") == sName ) else if ( _T("c:chart") == sName )
{ {
m_arrItems.Add( new OOX::Drawing::CChart( oReader )); m_arrItems.push_back( new OOX::Drawing::CChart( oReader ));
m_eGraphicType = graphictypeChart; m_eGraphicType = graphictypeChart;
} }
else if ( _T("wps:wsp") == sName ) else if ( _T("wps:wsp") == sName )
{ {
m_arrItems.Add( new OOX::Logic::CShape( oReader )); m_arrItems.push_back( new OOX::Logic::CShape( oReader ));
m_eGraphicType = graphictypeShape; m_eGraphicType = graphictypeShape;
} }
else if ( _T("wpg:wgp") == sName ) else if ( _T("wpg:wgp") == sName )
{ {
m_arrItems.Add( new OOX::Logic::CGroupShape( oReader )); m_arrItems.push_back( new OOX::Logic::CGroupShape( oReader ));
m_eGraphicType = graphictypeGroupShape; m_eGraphicType = graphictypeGroupShape;
} }
else if ( _T("wpc:wpc") == sName ) else if ( _T("wpc:wpc") == sName )
{ {
m_arrItems.Add( new OOX::Logic::CLockedCanvas( oReader )); m_arrItems.push_back( new OOX::Logic::CLockedCanvas( oReader ));
m_eGraphicType = graphictypeLockedCanvas; m_eGraphicType = graphictypeLockedCanvas;
} }
else if ( _T("lc:lockedCanvas") == sName ) else if ( _T("lc:lockedCanvas") == sName )
{ {
m_arrItems.Add( new OOX::Drawing::CLockedCanvas( oReader )); m_arrItems.push_back( new OOX::Drawing::CLockedCanvas( oReader ));
m_eGraphicType = graphictypeLockedCanvas; m_eGraphicType = graphictypeLockedCanvas;
} }
else if ( _T("dgm:relIds") == sName ) else if ( _T("dgm:relIds") == sName )
{ {
m_arrItems.Add( new OOX::Drawing::CDiagrammParts( oReader )); m_arrItems.push_back( new OOX::Drawing::CDiagrammParts( oReader ));
m_eGraphicType = graphictypeDiagram; m_eGraphicType = graphictypeDiagram;
} }
} }
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingParagraph.h
View file @ 792b97ca
...@@ -537,9 +537,9 @@ namespace OOX ...@@ -537,9 +537,9 @@ namespace OOX
if ( _T("a:pPr") == sName ) if ( _T("a:pPr") == sName )
m_oParagraphProperty = oReader; m_oParagraphProperty = oReader;
else if ( _T("a:r") == sName ) else if ( _T("a:r") == sName )
m_arrItems.Add( new CRun( oReader )); m_arrItems.push_back( new CRun( oReader ));
else if ( _T("a:br") == sName ) else if ( _T("a:br") == sName )
m_arrItems.Add( new CTextLineBreak( oReader )); m_arrItems.push_back( new CTextLineBreak( oReader ));
//else if ( _T("a:fld") == sName ) //else if ( _T("a:fld") == sName )
// pItem = new CField( oReader ); // pItem = new CField( oReader );
//else if ( _T("a:endParaRPr") == sName ) //else if ( _T("a:endParaRPr") == sName )
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingShape.h
View file @ 792b97ca
...@@ -325,9 +325,9 @@ namespace OOX ...@@ -325,9 +325,9 @@ namespace OOX
m_oTxSp = oReader; m_oTxSp = oReader;
else if ( _T("a:sp") == sName ) else if ( _T("a:sp") == sName )
m_arrItems.Add( new OOX::Drawing::CShape( oReader )); m_arrItems.push_back( new OOX::Drawing::CShape( oReader ));
else if ( _T("pic:pic") == sName )//??? else if ( _T("pic:pic") == sName )//???
m_arrItems.Add( new OOX::Drawing::CPicture( oReader )); m_arrItems.push_back( new OOX::Drawing::CPicture( oReader ));
//else if ( _T("a:grpSp") == sName )//???? //else if ( _T("a:grpSp") == sName )//????
// m_arrItems.Add( new OOX::Drawing::CGroupShape( oReader )); // m_arrItems.Add( new OOX::Drawing::CGroupShape( oReader ));
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingText.h
View file @ 792b97ca
...@@ -56,7 +56,7 @@ namespace OOX ...@@ -56,7 +56,7 @@ namespace OOX
//if ( _T("a:lstStyle") == sName ) //if ( _T("a:lstStyle") == sName )
// m_oLstStyle = oReader; // m_oLstStyle = oReader;
else if ( _T("a:p") == sName ) else if ( _T("a:p") == sName )
m_arrItems.Add( new Drawing::CParagraph( oReader )); m_arrItems.push_back( new Drawing::CParagraph( oReader ));
} }
} }
......
Common/DocxFormat/Source/DocxFormat/Logic/Shape.h
View file @ 792b97ca
...@@ -486,13 +486,13 @@ namespace OOX ...@@ -486,13 +486,13 @@ namespace OOX
m_oCNvGroupSpPr = oReader; m_oCNvGroupSpPr = oReader;
else if ( _T("wps:wsp") == sName ) else if ( _T("wps:wsp") == sName )
m_arrItems.Add( new OOX::Logic::CShape( oReader )); m_arrItems.push_back( new OOX::Logic::CShape( oReader ));
else if ( _T("c:chart") == sName ) //??? else if ( _T("c:chart") == sName ) //???
m_arrItems.Add( new OOX::Drawing::CChart( oReader )); m_arrItems.push_back( new OOX::Drawing::CChart( oReader ));
else if ( _T("pic:pic") == sName ) else if ( _T("pic:pic") == sName )
m_arrItems.Add( new OOX::Drawing::CPicture( oReader )); m_arrItems.push_back( new OOX::Drawing::CPicture( oReader ));
else if ( _T("wpg:grpSp") == sName ) else if ( _T("wpg:grpSp") == sName )
m_arrItems.Add( new OOX::Logic::CGroupShape( oReader )); m_arrItems.push_back( new OOX::Logic::CGroupShape( oReader ));
} }
} }
...@@ -563,13 +563,13 @@ namespace OOX ...@@ -563,13 +563,13 @@ namespace OOX
// m_oCNvGroupSpPr = oReader; // m_oCNvGroupSpPr = oReader;
if ( _T("wps:wsp") == sName ) if ( _T("wps:wsp") == sName )
m_arrItems.Add( new OOX::Logic::CShape( oReader )); m_arrItems.push_back( new OOX::Logic::CShape( oReader ));
else if ( _T("c:chart") == sName ) //??? else if ( _T("c:chart") == sName ) //???
m_arrItems.Add( new OOX::Drawing::CChart( oReader )); m_arrItems.push_back( new OOX::Drawing::CChart( oReader ));
else if ( _T("pic:pic") == sName ) else if ( _T("pic:pic") == sName )
m_arrItems.Add( new OOX::Drawing::CPicture( oReader )); m_arrItems.push_back( new OOX::Drawing::CPicture( oReader ));
else if ( _T("wpg:grpSp") == sName ) else if ( _T("wpg:grpSp") == sName )
m_arrItems.Add( new OOX::Logic::CGroupShape( oReader )); m_arrItems.push_back( new OOX::Logic::CGroupShape( oReader ));
} }
} }
......
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View file @ 792b97ca
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include "../XML/xmlutils.h" #include "../XML/xmlutils.h"
//#include "atlstr.h" //#include "atlstr.h"
#include <vector>
namespace OOX namespace OOX
{ {
#define WritingElement_AdditionConstructors(Class) \ #define WritingElement_AdditionConstructors(Class) \
...@@ -740,7 +742,7 @@ namespace OOX ...@@ -740,7 +742,7 @@ namespace OOX
m_arrItems[nIndex] = NULL; m_arrItems[nIndex] = NULL;
} }
m_arrItems.RemoveAll(); m_arrItems.clear();
} }
std::vector<ElemType *> m_arrItems; std::vector<ElemType *> m_arrItems;
//CSimpleArray<ElemType *> m_arrItems; //CSimpleArray<ElemType *> m_arrItems;
......
Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h
View file @ 792b97ca
...@@ -166,7 +166,7 @@ namespace OOX ...@@ -166,7 +166,7 @@ namespace OOX
for(int i = 0, length = pLegacyDrawing->m_arrItems.GetSize(); i < length; ++i) for(int i = 0, length = pLegacyDrawing->m_arrItems.GetSize(); i < length; ++i)
{ {
OOX::Vml::CShape* pShape = pLegacyDrawing->m_arrItems[i]; OOX::Vml::CShape* pShape = pLegacyDrawing->m_arrItems[i];
for(int j = 0, length2 = pShape->m_arrItems.GetSize(); j < length2; ++j) for(int j = 0, length2 = pShape->m_arrItems.size(); j < length2; ++j)
{ {
OOX::WritingElement* pElem = pShape->m_arrItems[j]; OOX::WritingElement* pElem = pShape->m_arrItems[j];
if( OOX::et_v_ClientData == pElem->getType()) if( OOX::et_v_ClientData == pElem->getType())
......
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