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:
Kirill Polyakov
2026-01-19 13:04:45 +03:00
parent 7146c08ef4
commit ebed729f13
109 changed files with 611 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HwpFile/HWPFile.pro
View File

@ -29,6 +29,7 @@ SOURCES += \
HwpDoc/Chart/Brush.cpp \
HwpDoc/Chart/CategoryScale.cpp \
HwpDoc/Chart/ChartReader.cpp \
HwpDoc/Chart/ChartStream.cpp \
HwpDoc/Chart/Contour.cpp \
HwpDoc/Chart/ContourGradient.cpp \
HwpDoc/Chart/Coor.cpp \
@ -156,9 +157,10 @@ HEADERS += \
HwpDoc/Chart/Bar.h \
HwpDoc/Chart/Brush.h \
HwpDoc/Chart/CategoryScale.h \
HwpDoc/Chart/CharCommon.h \
HwpDoc/Chart/ChartObject.h \
HwpDoc/Chart/ChartReader.h \
HwpDoc/Chart/Common.h \
HwpDoc/Chart/ChartStream.h \
HwpDoc/Chart/Contour.h \
HwpDoc/Chart/ContourGradient.h \
HwpDoc/Chart/Coor.h \

4
HwpFile/HwpDoc/Chart/Attribute.cpp
View File

@ -7,9 +7,9 @@ CAttribute::CAttribute()
}
bool CAttribute::Read(CHWPStream& oStream)
bool CAttribute::Read(CChartStream& oStream)
{
return m_oBrush.Read(oStream) && m_oPen.Read(oStream) &&
oStream.ReadString(m_sText, DEFAULT_STRING_CHARACTER) && oStream.ReadDouble(m_dValue);
oStream.ReadString(m_sText) && oStream.ReadDouble(m_dValue);
}
}}

8
HwpFile/HwpDoc/Chart/Attribute.h
View File

@ -9,16 +9,14 @@ namespace HWP { namespace CHART
{
class CAttribute : public IChartObject
{
using _type = HWP::CHART::CAttribute;
CBrush m_oBrush;
CPen m_oPen;
HWP_STRING m_sText;
double m_dValue;
CHART_STRING m_sText;
CHART_DOUBLE m_dValue;
public:
CAttribute();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
using CAttributes = CCollection<CAttribute>;

20
HwpFile/HwpDoc/Chart/Axis.cpp
View File

@ -7,7 +7,7 @@ CAxisGrid::CAxisGrid()
}
bool CAxisGrid::Read(CHWPStream& oStream)
bool CAxisGrid::Read(CChartStream& oStream)
{
return m_oMajorPen.Read(oStream) && m_oMinorPen.Read(oStream);
}
@ -17,10 +17,10 @@ CAxisScale::CAxisScale()
}
bool CAxisScale::Read(CHWPStream& oStream)
bool CAxisScale::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bHide) && oStream.ReadInt(m_nLogBase) &&
oStream.ReadString(m_sPercentBasis, DEFAULT_STRING_CHARACTER) && oStream.ReadInt(m_nType);
return oStream.ReadBoolean(m_bHide) && oStream.ReadInteger(m_nLogBase) &&
oStream.ReadString(m_sPercentBasis) && oStream.ReadInteger(m_nType);
}
CAxisTitle::CAxisTitle()
@ -28,11 +28,11 @@ CAxisTitle::CAxisTitle()
}
bool CAxisTitle::Read(CHWPStream& oStream)
bool CAxisTitle::Read(CChartStream& oStream)
{
return m_oBackdrop.Read(oStream) && oStream.ReadString(m_sText, DEFAULT_STRING_CHARACTER) &&
m_oTextLayout.Read(oStream) && oStream.ReadInt(m_nTextLength) &&
oStream.ReadBool(m_bVisible) && m_oVtFont.Read(oStream);
return m_oBackdrop.Read(oStream) && oStream.ReadString(m_sText) &&
m_oTextLayout.Read(oStream) && oStream.ReadInteger(m_nTextLength) &&
oStream.ReadBoolean(m_bVisible) && m_oVtFont.Read(oStream);
}
CAxis::CAxis()
@ -40,12 +40,12 @@ CAxis::CAxis()
}
bool CAxis::Read(CHWPStream& oStream)
bool CAxis::Read(CChartStream& oStream)
{
return m_oAxisGrid.Read(oStream) && m_oAxisScale.Read(oStream) &&
m_oAxisTitle.Read(oStream) && m_oCategoryScale.Read(oStream) &&
m_oDateScale.Read(oStream) && m_oIntersection.Read(oStream) &&
m_oLabels.Read(oStream) && oStream.ReadInt(m_nLabelLevelCount) &&
m_oLabels.Read(oStream) && oStream.ReadInteger(m_nLabelLevelCount) &&
m_oPen.Read(oStream) && m_oTick.Read(oStream) && m_oValueScale.Read(oStream);
}
}}

24
HwpFile/HwpDoc/Chart/Axis.h
View File

@ -21,33 +21,33 @@ class CAxisGrid : public IChartObject
public:
CAxisGrid();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CAxisScale : public IChartObject
{
bool m_bHide;
int m_nLogBase;
HWP_STRING m_sPercentBasis;
int m_nType;
CHART_BOOLEAN m_bHide;
CHART_INTEGER m_nLogBase;
CHART_STRING m_sPercentBasis;
CHART_INTEGER m_nType;
public:
CAxisScale();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CAxisTitle : public IChartObject
{
CBackdrop m_oBackdrop;
HWP_STRING m_sText;
CHART_STRING m_sText;
CTextLayout m_oTextLayout;
int m_nTextLength;
bool m_bVisible;
CHART_INTEGER m_nTextLength;
CHART_BOOLEAN m_bVisible;
CVtFont m_oVtFont;
public:
CAxisTitle();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CAxis : public IChartObject
@ -59,14 +59,14 @@ class CAxis : public IChartObject
CDateScale m_oDateScale;
CIntersection m_oIntersection;
CLabels m_oLabels;
int m_nLabelLevelCount;
CHART_INTEGER m_nLabelLevelCount;
CPen m_oPen;
CTick m_oTick;
CValueScale m_oValueScale;
public:
CAxis();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

2
HwpFile/HwpDoc/Chart/Backdrop.cpp
View File

@ -7,7 +7,7 @@ CBackdrop::CBackdrop()
}
bool CBackdrop::Read(CHWPStream& oStream)
bool CBackdrop::Read(CChartStream& oStream)
{
return m_oFrame.Read(oStream) && m_oFill.Read(oStream) && m_oShadow.Read(oStream);
}

2
HwpFile/HwpDoc/Chart/Backdrop.h
View File

@ -15,7 +15,7 @@ class CBackdrop : public IChartObject
public:
CBackdrop();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Bar.cpp
View File

@ -7,8 +7,8 @@ CBar::CBar()
}
bool CBar::Read(CHWPStream& oStream)
bool CBar::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nSides) && oStream.ReadShort(m_snTopRatio);
return oStream.ReadInteger(m_nSides) && oStream.ReadSingle(m_snTopRatio);
}
}}

6
HwpFile/HwpDoc/Chart/Bar.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CBar : public IChartObject
{
int m_nSides;
SINGLE m_snTopRatio;
CHART_INTEGER m_nSides;
CHART_SINGLE m_snTopRatio;
public:
CBar();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/Brush.cpp
View File

@ -7,9 +7,9 @@ CBrush::CBrush()
}
bool CBrush::Read(CHWPStream& oStream)
bool CBrush::Read(CChartStream& oStream)
{
return m_oFillColor.Read(oStream) && oStream.ReadInt(m_nIndex) &&
m_oPatternColor.Read(oStream) && oStream.ReadInt(m_nStyle);
return m_oFillColor.Read(oStream) && oStream.ReadInteger(m_nIndex) &&
m_oPatternColor.Read(oStream) && oStream.ReadInteger(m_nStyle);
}
}}

6
HwpFile/HwpDoc/Chart/Brush.h
View File

@ -8,13 +8,13 @@ namespace HWP { namespace CHART
class CBrush : public IChartObject
{
CVtColor m_oFillColor;
int m_nIndex;
CHART_INTEGER m_nIndex;
CVtColor m_oPatternColor;
int m_nStyle;
CHART_INTEGER m_nStyle;
public:
CBrush();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/CategoryScale.cpp
View File

@ -7,9 +7,9 @@ CCategoryScale::CCategoryScale()
}
bool CCategoryScale::Read(CHWPStream& oStream)
bool CCategoryScale::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAuto) && oStream.ReadInt(m_nDivisionsPerLabel) &&
oStream.ReadInt(m_nDivisionsPerTick) && oStream.ReadBool(m_bLabelTick);
return oStream.ReadBoolean(m_bAuto) && oStream.ReadInteger(m_nDivisionsPerLabel) &&
oStream.ReadInteger(m_nDivisionsPerTick) && oStream.ReadBoolean(m_bLabelTick);
}
}}

10
HwpFile/HwpDoc/Chart/CategoryScale.h
View File

@ -7,14 +7,14 @@ namespace HWP { namespace CHART
{
class CCategoryScale : public IChartObject
{
bool m_bAuto;
int m_nDivisionsPerLabel;
int m_nDivisionsPerTick;
bool m_bLabelTick;
CHART_BOOLEAN m_bAuto;
CHART_INTEGER m_nDivisionsPerLabel;
CHART_INTEGER m_nDivisionsPerTick;
CHART_BOOLEAN m_bLabelTick;
public:
CCategoryScale();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

17
HwpFile/HwpDoc/Chart/CharCommon.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef CHARCOMMON_H
#define CHARCOMMON_H
#include <cstdint>
#include <string>
namespace HWP { namespace CHART
{
typedef bool CHART_BOOLEAN;
typedef int8_t CHART_INTEGER;
typedef int CHART_LONG;
typedef float CHART_SINGLE;
typedef double CHART_DOUBLE;
typedef std::wstring CHART_STRING;
}}
#endif // CHARCOMMON_H

9
HwpFile/HwpDoc/Chart/ChartObject.h
View File

@ -2,19 +2,18 @@
#define CHARTOBJECT_H
#include "Types.h"
#include "../Common/Common.h"
#include "../HWPStream.h"
#include "ChartStream.h"
namespace HWP { namespace CHART
{
class IChartObject
{
long m_lId;
long m_lStoredtypeId;
CHART_LONG m_lId;
CHART_LONG m_lStoredtypeId;
protected:
IChartObject() = default;
public:
virtual bool Read(CHWPStream& oStream) = 0;
virtual bool Read(CChartStream& oStream) = 0;
// virtual ETypes GetType() const = 0;
};
}}

14
HwpFile/HwpDoc/Chart/ChartReader.cpp
View File

@ -11,20 +11,16 @@ CChartReader::CChartReader()
bool CChartReader::ReadFromOle(CHWPStream& oOleData)
{
oOleData.Skip(44); //Unknown data
CChartStream oChartStream(&oOleData);
short shStoredNameLength;
oOleData.ReadShort(shStoredNameLength);
HWP_STRING sStoredName;
oOleData.ReadString(sStoredName, shStoredNameLength, EStringCharacter::ASCII);
// if ("VtChart" == sStoredName)
oChartStream.Skip(44); //Unknown data
CHART_STRING sStoredName;
oChartStream.ReadString(sStoredName);
CVtChart oVtChart;
if (!oVtChart.Read(oOleData))
if (!oVtChart.Read(oChartStream))
return false;
return false;

74
HwpFile/HwpDoc/Chart/ChartStream.cpp Normal file
View File

@ -0,0 +1,74 @@
#include "ChartStream.h"
namespace HWP { namespace CHART
{
CChartStream::CChartStream()
: m_pStream(nullptr), m_bExternStream(false)
{}
CChartStream::CChartStream(CHWPStream* pStream, bool bExtern)
: m_pStream(pStream), m_bExternStream(bExtern)
{}
CChartStream::~CChartStream()
{
if (nullptr != m_pStream && !m_bExternStream)
delete m_pStream;
}
#define CHECK_VALID()\
if (!Valid())\
return false
bool CChartStream::ReadBoolean(CHART_BOOLEAN& bValue)
{
CHECK_VALID();
return m_pStream->ReadBool(bValue);
}
bool CChartStream::ReadInteger(CHART_INTEGER& nValue)
{
CHECK_VALID();
return m_pStream->ReadByte((HWP_BYTE&)nValue);
}
bool CChartStream::ReadLong(CHART_LONG& lValue)
{
CHECK_VALID();
return m_pStream->ReadInt(lValue);
}
bool CChartStream::ReadSingle(CHART_SINGLE& fValue)
{
CHECK_VALID();
return m_pStream->ReadFloat(fValue);
}
bool CChartStream::ReadDouble(CHART_DOUBLE& dValue)
{
CHECK_VALID();
return m_pStream->ReadDouble(dValue);
}
bool CChartStream::ReadString(HWP_STRING& sValue)
{
CHECK_VALID();
short shCount;
if (!m_pStream->ReadShort(shCount))
return false;
return m_pStream->ReadString(sValue, shCount, EStringCharacter::ASCII);
}
void CChartStream::Skip(int nStep)
{
if (nullptr != m_pStream)
m_pStream->Skip(nStep);
}
bool CChartStream::Valid() const
{
return nullptr != m_pStream && m_pStream->IsValid();
}
}}

31
HwpFile/HwpDoc/Chart/ChartStream.h Normal file
View File

@ -0,0 +1,31 @@
#ifndef CHARTSTREAM_H
#define CHARTSTREAM_H
#include "../HWPStream.h"
#include "CharCommon.h"
namespace HWP { namespace CHART
{
class CChartStream
{
CHWPStream *m_pStream;
bool m_bExternStream;
public:
CChartStream();
CChartStream(CHWPStream* pStream, bool bExtern = true);
~CChartStream();
bool ReadBoolean(CHART_BOOLEAN& bValue);
bool ReadInteger(CHART_INTEGER& nValue);
bool ReadLong(CHART_LONG& lValue);
bool ReadSingle(CHART_SINGLE& fValue);
bool ReadDouble(CHART_DOUBLE& dValue);
bool ReadString(HWP_STRING& sValue);
void Skip(int nStep);
private:
bool Valid() const;
};
}}
#endif // CHARTSTREAM_H

4
HwpFile/HwpDoc/Chart/Collection.h
View File

@ -26,9 +26,9 @@ public:
return true;
}
virtual bool Read(CHWPStream& oStream)
virtual bool Read(CChartStream& oStream) override
{
long lCount;
CHART_LONG lCount;
if (!oStream.ReadLong(lCount))
return false;

11
HwpFile/HwpDoc/Chart/Common.h
View File

@ -1,11 +0,0 @@
#ifndef COMMON_H
#define COMMON_H
#include <cstdint>
namespace HWP { namespace CHART
{
typedef int8_t CHART_INT;
}}
#endif // COMMON_H

4
HwpFile/HwpDoc/Chart/Contour.cpp
View File

@ -7,8 +7,8 @@ CContour::CContour()
}
bool CContour::Read(CHWPStream& oStream)
bool CContour::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nDisplayType);
return oStream.ReadInteger(m_nDisplayType);
}
}}

4
HwpFile/HwpDoc/Chart/Contour.h
View File

@ -7,11 +7,11 @@ namespace HWP { namespace CHART
{
class CContour : public IChartObject
{
int m_nDisplayType;
CHART_INTEGER m_nDisplayType;
public:
CContour();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

2
HwpFile/HwpDoc/Chart/ContourGradient.cpp
View File

@ -7,7 +7,7 @@ CContourGradient::CContourGradient()
}
bool CContourGradient::Read(CHWPStream& oStream)
bool CContourGradient::Read(CChartStream& oStream)
{
return m_oFromBrushColor.Read(oStream) && m_oToBrushColor.Read(oStream) &&
m_oFromPenColor.Read(oStream) && m_oToPenColor.Read(oStream);

2
HwpFile/HwpDoc/Chart/ContourGradient.h
View File

@ -14,7 +14,7 @@ class CContourGradient : public IChartObject
public:
CContourGradient();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Coor.cpp
View File

@ -7,8 +7,8 @@ CCoor::CCoor()
}
bool CCoor::Read(CHWPStream& oStream)
bool CCoor::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snX) && oStream.ReadShort(m_snY);
return oStream.ReadSingle(m_snX) && oStream.ReadSingle(m_snY);
}
}}

6
HwpFile/HwpDoc/Chart/Coor.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CCoor : public IChartObject
{
SINGLE m_snX;
SINGLE m_snY;
CHART_SINGLE m_snX;
CHART_SINGLE m_snY;
public:
CCoor();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Coor3.cpp
View File

@ -7,8 +7,8 @@ CCoor3::CCoor3()
}
bool CCoor3::Read(CHWPStream& oStream)
bool CCoor3::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snX) && oStream.ReadShort(m_snY) && oStream.ReadShort(m_snZ);
return oStream.ReadSingle(m_snX) && oStream.ReadSingle(m_snY) && oStream.ReadSingle(m_snZ);
}
}}

8
HwpFile/HwpDoc/Chart/Coor3.h
View File

@ -7,13 +7,13 @@ namespace HWP { namespace CHART
{
class CCoor3 : public IChartObject
{
SINGLE m_snX;
SINGLE m_snY;
SINGLE m_snZ;
CHART_SINGLE m_snX;
CHART_SINGLE m_snY;
CHART_SINGLE m_snZ;
public:
CCoor3();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

10
HwpFile/HwpDoc/Chart/DataGrid.cpp
View File

@ -7,11 +7,11 @@ CDataGrid::CDataGrid()
}
bool CDataGrid::Read(CHWPStream& oStream)
bool CDataGrid::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nColumnCount) && oStream.ReadString(m_sColumnLabel, DEFAULT_STRING_CHARACTER) &&
oStream.ReadInt(m_nColumnLabelCount) && oStream.ReadInt(m_nCompositeColumnLabel) &&
oStream.ReadString(m_sCompositeRowLabel, DEFAULT_STRING_CHARACTER) && oStream.ReadInt(m_nRowCount) &&
oStream.ReadString(m_sRowLabel, DEFAULT_STRING_CHARACTER) && oStream.ReadInt(m_nRowLabelCount);
return oStream.ReadInteger(m_nColumnCount) && oStream.ReadString(m_sColumnLabel) &&
oStream.ReadInteger(m_nColumnLabelCount) && oStream.ReadInteger(m_nCompositeColumnLabel) &&
oStream.ReadString(m_sCompositeRowLabel) && oStream.ReadInteger(m_nRowCount) &&
oStream.ReadString(m_sRowLabel) && oStream.ReadInteger(m_nRowLabelCount);
}
}}

18
HwpFile/HwpDoc/Chart/DataGrid.h
View File

@ -7,18 +7,18 @@ namespace HWP { namespace CHART
{
class CDataGrid : public IChartObject
{
int m_nColumnCount;
HWP_STRING m_sColumnLabel;
int m_nColumnLabelCount;
int m_nCompositeColumnLabel;
HWP_STRING m_sCompositeRowLabel;
int m_nRowCount;
HWP_STRING m_sRowLabel;
int m_nRowLabelCount;
CHART_INTEGER m_nColumnCount;
CHART_STRING m_sColumnLabel;
CHART_INTEGER m_nColumnLabelCount;
CHART_INTEGER m_nCompositeColumnLabel;
CHART_STRING m_sCompositeRowLabel;
CHART_INTEGER m_nRowCount;
CHART_STRING m_sRowLabel;
CHART_INTEGER m_nRowLabelCount;
public:
CDataGrid();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

20
HwpFile/HwpDoc/Chart/DataPoint.cpp
View File

@ -7,16 +7,14 @@ CDataPointLabel::CDataPointLabel()
}
bool CDataPointLabel::Read(CHWPStream& oStream)
bool CDataPointLabel::Read(CChartStream& oStream)
{
return m_oBackdrop.Read(oStream) && oStream.ReadInt(m_nComponent) &&
oStream.ReadBool(m_bCustom) && oStream.ReadInt(m_nLineStyle) &&
oStream.ReadInt(m_nLocationType) && m_oOffset.Read(oStream) &&
oStream.ReadString(m_sPercentFormat, DEFAULT_STRING_CHARACTER) &&
oStream.ReadString(m_sText, DEFAULT_STRING_CHARACTER) &&
m_oTextLayout.Read(oStream) && oStream.ReadInt(m_nTextLength) &&
oStream.ReadString(m_sValueFormat, DEFAULT_STRING_CHARACTER) &&
m_oVtFont.Read(oStream);
return m_oBackdrop.Read(oStream) && oStream.ReadInteger(m_nComponent) &&
oStream.ReadBoolean(m_bCustom) && oStream.ReadInteger(m_nLineStyle) &&
oStream.ReadInteger(m_nLocationType) && m_oOffset.Read(oStream) &&
oStream.ReadString(m_sPercentFormat) && oStream.ReadString(m_sText) &&
m_oTextLayout.Read(oStream) && oStream.ReadInteger(m_nTextLength) &&
oStream.ReadString(m_sValueFormat) && m_oVtFont.Read(oStream);
}
CDataPoint::CDataPoint()
@ -24,10 +22,10 @@ CDataPoint::CDataPoint()
}
bool CDataPoint::Read(CHWPStream& oStream)
bool CDataPoint::Read(CChartStream& oStream)
{
return m_oBrush.Read(oStream) && m_oDataPointLabel.Read(oStream) &&
m_oEdgePen.Read(oStream) && oStream.ReadShort(m_snOffset) &&
m_oEdgePen.Read(oStream) && oStream.ReadSingle(m_snOffset) &&
m_oMarker.Read(oStream) && m_oVtPicture.Read(oStream);
}
}}

22
HwpFile/HwpDoc/Chart/DataPoint.h
View File

@ -16,21 +16,21 @@ namespace HWP { namespace CHART
class CDataPointLabel : public IChartObject
{
CBackdrop m_oBackdrop;
int m_nComponent;
bool m_bCustom;
int m_nLineStyle;
int m_nLocationType;
CHART_INTEGER m_nComponent;
CHART_BOOLEAN m_bCustom;
CHART_INTEGER m_nLineStyle;
CHART_INTEGER m_nLocationType;
CCoor m_oOffset;
HWP_STRING m_sPercentFormat;
HWP_STRING m_sText;
CHART_STRING m_sPercentFormat;
CHART_STRING m_sText;
CTextLayout m_oTextLayout;
int m_nTextLength;
HWP_STRING m_sValueFormat;
CHART_INTEGER m_nTextLength;
CHART_STRING m_sValueFormat;
CVtFont m_oVtFont;
public:
CDataPointLabel();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CDataPoint : public IChartObject
@ -38,13 +38,13 @@ class CDataPoint : public IChartObject
CBrush m_oBrush;
CDataPointLabel m_oDataPointLabel;
CPen m_oEdgePen;
SINGLE m_snOffset;
CHART_SINGLE m_snOffset;
CMarker m_oMarker;
CVtPicture m_oVtPicture;
public:
CDataPoint();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
using CDataPoints = CCollection<CDataPoint>;

10
HwpFile/HwpDoc/Chart/DateScale.cpp
View File

@ -7,11 +7,11 @@ CDateScale::CDateScale()
}
bool CDateScale::Read(CHWPStream& oStream)
bool CDateScale::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAuto) && oStream.ReadInt(m_nMajFreq) &&
oStream.ReadInt(m_nMajInt) && oStream.ReadDouble(m_dMaximum) &&
oStream.ReadDouble(m_dMinimum) && oStream.ReadInt(m_nMinFreq) &&
oStream.ReadInt(m_nMinInt) && oStream.ReadBool(m_bSkipWeekend);
return oStream.ReadBoolean(m_bAuto) && oStream.ReadInteger(m_nMajFreq) &&
oStream.ReadInteger(m_nMajInt) && oStream.ReadDouble(m_dMaximum) &&
oStream.ReadDouble(m_dMinimum) && oStream.ReadInteger(m_nMinFreq) &&
oStream.ReadInteger(m_nMinInt) && oStream.ReadBoolean(m_bSkipWeekend);
}
}}

18
HwpFile/HwpDoc/Chart/DateScale.h
View File

@ -7,18 +7,18 @@ namespace HWP { namespace CHART
{
class CDateScale : public IChartObject
{
bool m_bAuto;
int m_nMajFreq;
int m_nMajInt;
double m_dMaximum;
double m_dMinimum;
int m_nMinFreq;
int m_nMinInt;
bool m_bSkipWeekend;
CHART_BOOLEAN m_bAuto;
CHART_INTEGER m_nMajFreq;
CHART_INTEGER m_nMajInt;
CHART_DOUBLE m_dMaximum;
CHART_DOUBLE m_dMinimum;
CHART_INTEGER m_nMinFreq;
CHART_INTEGER m_nMinInt;
CHART_BOOLEAN m_bSkipWeekend;
public:
CDateScale();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Doughnut.cpp
View File

@ -7,8 +7,8 @@ CDoughnut::CDoughnut()
}
bool CDoughnut::Read(CHWPStream& oStream)
bool CDoughnut::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nSides) && oStream.ReadShort(m_snInteriorRatio);
return oStream.ReadInteger(m_nSides) && oStream.ReadSingle(m_snInteriorRatio);
}
}}

6
HwpFile/HwpDoc/Chart/Doughnut.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CDoughnut : public IChartObject
{
int m_nSides;
SINGLE m_snInteriorRatio;
CHART_INTEGER m_nSides;
CHART_SINGLE m_snInteriorRatio;
public:
CDoughnut();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

8
HwpFile/HwpDoc/Chart/Elevation.cpp
View File

@ -7,12 +7,12 @@ CElevation::CElevation()
}
bool CElevation::Read(CHWPStream& oStream)
bool CElevation::Read(CChartStream& oStream)
{
return m_oAttributes.Read(oStream) && oStream.ReadBool(m_bAutoValues) &&
oStream.ReadInt(m_nColorType) && oStream.ReadInt(m_nColSmoothing) &&
return m_oAttributes.Read(oStream) && oStream.ReadBoolean(m_bAutoValues) &&
oStream.ReadInteger(m_nColorType) && oStream.ReadInteger(m_nColSmoothing) &&
m_oContour.Read(oStream) && m_oContourGradient.Read(oStream) &&
oStream.ReadInt(m_nRowSmoothing) && oStream.ReadBool(m_bSeparateContourData) &&
oStream.ReadInteger(m_nRowSmoothing) && oStream.ReadBoolean(m_bSeparateContourData) &&
m_oSurface.Read(oStream);
}
}}

12
HwpFile/HwpDoc/Chart/Elevation.h
View File

@ -11,18 +11,18 @@ namespace HWP { namespace CHART
class CElevation : public IChartObject
{
CAttributes m_oAttributes;
bool m_bAutoValues;
int m_nColorType;
int m_nColSmoothing;
CHART_BOOLEAN m_bAutoValues;
CHART_INTEGER m_nColorType;
CHART_INTEGER m_nColSmoothing;
CContour m_oContour;
CContourGradient m_oContourGradient;
int m_nRowSmoothing;
bool m_bSeparateContourData;
CHART_INTEGER m_nRowSmoothing;
CHART_BOOLEAN m_bSeparateContourData;
CSurface m_oSurface;
public:
CElevation();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Fill.cpp
View File

@ -7,9 +7,9 @@ CFill::CFill()
}
bool CFill::Read(CHWPStream& oStream)
bool CFill::Read(CChartStream& oStream)
{
return m_oBrush.Read(oStream) && /*&&*/
oStream.ReadInt(m_nStyle) && m_oVtPicture.Read(oStream);
oStream.ReadInteger(m_nStyle) && m_oVtPicture.Read(oStream);
}
}}

4
HwpFile/HwpDoc/Chart/Fill.h
View File

@ -15,12 +15,12 @@ class CFill : public IChartObject
// CGradient m_oGradient;
// CVtPicture m_oPicture;
// } m_oGradient;
int m_nStyle;
CHART_INTEGER m_nStyle;
CVtPicture m_oVtPicture;
public:
CFill();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

7
HwpFile/HwpDoc/Chart/Footnote.cpp
View File

@ -7,11 +7,10 @@ CFootnote::CFootnote()
}
bool CFootnote::Read(CHWPStream& oStream)
bool CFootnote::Read(CChartStream& oStream)
{
return m_oBackdrop.Read(oStream) && m_oLocation.Read(oStream) &&
oStream.ReadString(m_sText, DEFAULT_STRING_CHARACTER) &&
m_oTextLayout.Read(oStream) && oStream.ReadInt(m_nTextLength) &&
m_oVtFont.Read(oStream);
oStream.ReadString(m_sText) && m_oTextLayout.Read(oStream) &&
oStream.ReadInteger(m_nTextLength) && m_oVtFont.Read(oStream);
}
}}

6
HwpFile/HwpDoc/Chart/Footnote.h
View File

@ -12,14 +12,14 @@ class CFootnote : public IChartObject
{
CBackdrop m_oBackdrop;
CLocation m_oLocation;
HWP_STRING m_sText;
CHART_STRING m_sText;
CTextLayout m_oTextLayout;
int m_nTextLength;
CHART_INTEGER m_nTextLength;
CVtFont m_oVtFont;
public:
CFootnote();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Frame.cpp
View File

@ -7,9 +7,9 @@ CFrame::CFrame()
}
bool CFrame::Read(CHWPStream& oStream)
bool CFrame::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nStyle) && oStream.ReadShort(m_snWidth) &&
return oStream.ReadInteger(m_nStyle) && oStream.ReadSingle(m_snWidth) &&
m_oFrameColor.Read(oStream) && m_oSpaceColor.Read(oStream);
}
}}

6
HwpFile/HwpDoc/Chart/Frame.h
View File

@ -7,14 +7,14 @@ namespace HWP { namespace CHART
{
class CFrame : public IChartObject
{
int m_nStyle;
SINGLE m_snWidth;
CHART_INTEGER m_nStyle;
CHART_SINGLE m_snWidth;
CVtColor m_oFrameColor;
CVtColor m_oSpaceColor;
public:
CFrame();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/Gradient.cpp
View File

@ -6,4 +6,10 @@ CGradient::CGradient()
{
}
bool CGradient::Read(CChartStream& oStream)
{
return m_oFromColor.Read(oStream) && oStream.ReadInteger(m_nStyle) &&
m_oToColor.Read(oStream);
}
}}

6
HwpFile/HwpDoc/Chart/Gradient.h
View File

@ -5,13 +5,15 @@
namespace HWP { namespace CHART
{
class CGradient
class CGradient : public IChartObject
{
CVtColor m_oFromColor;
int m_nStyle;
CHART_INTEGER m_nStyle;
CVtColor m_oToColor;
public:
CGradient();
bool Read(CChartStream& oStream) override;
};
}}

2
HwpFile/HwpDoc/Chart/HiLo.cpp
View File

@ -7,7 +7,7 @@ CHiLo::CHiLo()
}
bool CHiLo::Read(CHWPStream& oStream)
bool CHiLo::Read(CChartStream& oStream)
{
return m_oGainColor.Read(oStream) && m_oLossColor.Read(oStream);
}

2
HwpFile/HwpDoc/Chart/HiLo.h
View File

@ -12,7 +12,7 @@ class CHiLo : public IChartObject
public:
CHiLo();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/Intersection.cpp
View File

@ -7,10 +7,10 @@ CIntersection::CIntersection()
}
bool CIntersection::Read(CHWPStream& oStream)
bool CIntersection::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAuto) && oStream.ReadInt(m_nAxisId) &&
oStream.ReadInt(m_nIndex) && oStream.ReadBool(m_bLabelsInsidePlot) &&
return oStream.ReadBoolean(m_bAuto) && oStream.ReadInteger(m_nAxisId) &&
oStream.ReadInteger(m_nIndex) && oStream.ReadBoolean(m_bLabelsInsidePlot) &&
oStream.ReadDouble(m_dPoint);
}
}}

12
HwpFile/HwpDoc/Chart/Intersection.h
View File

@ -7,15 +7,15 @@ namespace HWP { namespace CHART
{
class CIntersection : public IChartObject
{
bool m_bAuto;
int m_nAxisId;
int m_nIndex;
bool m_bLabelsInsidePlot;
double m_dPoint;
CHART_BOOLEAN m_bAuto;
CHART_INTEGER m_nAxisId;
CHART_INTEGER m_nIndex;
CHART_BOOLEAN m_bLabelsInsidePlot;
CHART_DOUBLE m_dPoint;
public:
CIntersection();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

2
HwpFile/HwpDoc/Chart/LCoor.cpp
View File

@ -7,7 +7,7 @@ CLCoor::CLCoor()
}
bool CLCoor::Read(CHWPStream& oStream)
bool CLCoor::Read(CChartStream& oStream)
{
return oStream.ReadLong(m_lX) && oStream.ReadLong(m_lY);
}

6
HwpFile/HwpDoc/Chart/LCoor.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CLCoor : public IChartObject
{
long m_lX;
long m_lY;
CHART_LONG m_lX;
CHART_LONG m_lY;
public:
CLCoor();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

2
HwpFile/HwpDoc/Chart/LRect.cpp
View File

@ -7,7 +7,7 @@ CLRect::CLRect()
}
bool CLRect::Read(CHWPStream& oStream)
bool CLRect::Read(CChartStream& oStream)
{
return m_oMax.Read(oStream) && m_oMin.Read(oStream);
}

2
HwpFile/HwpDoc/Chart/LRect.h
View File

@ -12,7 +12,7 @@ class CLRect : public IChartObject
public:
CLRect();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

9
HwpFile/HwpDoc/Chart/Label.cpp
View File

@ -7,12 +7,11 @@ CLabel::CLabel()
}
bool CLabel::Read(CHWPStream& oStream)
bool CLabel::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAuto) && m_oBackdrop.Read(oStream) &&
oStream.ReadString(m_sFormat, DEFAULT_STRING_CHARACTER) &&
oStream.ReadString(m_sFormatLength, DEFAULT_STRING_CHARACTER) &&
oStream.ReadBool(m_bStanding) && m_oTextLayout.Read(oStream) &&
return oStream.ReadBoolean(m_bAuto) && m_oBackdrop.Read(oStream) &&
oStream.ReadString(m_sFormat) && oStream.ReadString(m_sFormatLength) &&
oStream.ReadBoolean(m_bStanding) && m_oTextLayout.Read(oStream) &&
m_oVtFont.Read(oStream);
}
}}

10
HwpFile/HwpDoc/Chart/Label.h
View File

@ -10,17 +10,17 @@ namespace HWP { namespace CHART
{
class CLabel : public IChartObject
{
bool m_bAuto;
CHART_BOOLEAN m_bAuto;
CBackdrop m_oBackdrop;
HWP_STRING m_sFormat;
HWP_STRING m_sFormatLength;
bool m_bStanding;
CHART_STRING m_sFormat;
CHART_STRING m_sFormatLength;
CHART_BOOLEAN m_bStanding;
CTextLayout m_oTextLayout;
CVtFont m_oVtFont;
public:
CLabel();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
using CLabels = CCollection<CLabel>;

2
HwpFile/HwpDoc/Chart/Legend.cpp
View File

@ -7,7 +7,7 @@ CLegend::CLegend()
}
bool CLegend::Read(CHWPStream& oStream)
bool CLegend::Read(CChartStream& oStream)
{
return m_oBackdrop.Read(oStream) && m_oLocation.Read(oStream) &&
m_oTextLayout.Read(oStream) && m_oVtFont.Read(oStream);

2
HwpFile/HwpDoc/Chart/Legend.h
View File

@ -17,7 +17,7 @@ class CLegend : public IChartObject
public:
CLegend();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

12
HwpFile/HwpDoc/Chart/Light.cpp
View File

@ -7,10 +7,10 @@ CLightSource::CLightSource()
}
bool CLightSource::Read(CHWPStream& oStream)
bool CLightSource::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snX) && oStream.ReadShort(m_snY) &&
oStream.ReadShort(m_snZ) && oStream.ReadShort(m_snIntensity);
return oStream.ReadSingle(m_snX) && oStream.ReadSingle(m_snY) &&
oStream.ReadSingle(m_snZ) && oStream.ReadSingle(m_snIntensity);
}
CLight::CLight()
@ -18,9 +18,9 @@ CLight::CLight()
}
bool CLight::Read(CHWPStream& oStream)
bool CLight::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snAmbientIntensity) && oStream.ReadShort(m_snEdgeIntensity) &&
oStream.ReadBool(m_bEdgeVisible) && m_oLightSources.Read(oStream);
return oStream.ReadSingle(m_snAmbientIntensity) && oStream.ReadSingle(m_snEdgeIntensity) &&
oStream.ReadBoolean(m_bEdgeVisible) && m_oLightSources.Read(oStream);
}
}}

18
HwpFile/HwpDoc/Chart/Light.h
View File

@ -7,28 +7,28 @@ namespace HWP { namespace CHART
{
class CLightSource : public IChartObject
{
SINGLE m_snX;
SINGLE m_snY;
SINGLE m_snZ;
SINGLE m_snIntensity;
CHART_SINGLE m_snX;
CHART_SINGLE m_snY;
CHART_SINGLE m_snZ;
CHART_SINGLE m_snIntensity;
public:
CLightSource();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
using CLightSources = CCollection<CLightSource>;
class CLight : public IChartObject
{
SINGLE m_snAmbientIntensity;
SINGLE m_snEdgeIntensity;
bool m_bEdgeVisible;
CHART_SINGLE m_snAmbientIntensity;
CHART_SINGLE m_snEdgeIntensity;
CHART_BOOLEAN m_bEdgeVisible;
CLightSources m_oLightSources;
public:
CLight();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Location.cpp
View File

@ -7,8 +7,8 @@ CLocation::CLocation()
}
bool CLocation::Read(CHWPStream& oStream)
bool CLocation::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nLocationType) && m_oRect.Read(oStream) && oStream.ReadBool(m_bVisible);
return oStream.ReadInteger(m_nLocationType) && m_oRect.Read(oStream) && oStream.ReadBoolean(m_bVisible);
}
}}

6
HwpFile/HwpDoc/Chart/Location.h
View File

@ -7,13 +7,13 @@ namespace HWP { namespace CHART
{
class CLocation : public IChartObject
{
int m_nLocationType;
CHART_INTEGER m_nLocationType;
CRect m_oRect;
bool m_bVisible;
CHART_BOOLEAN m_bVisible;
public:
CLocation();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/Marker.cpp
View File

@ -7,10 +7,10 @@ CMarker::CMarker()
}
bool CMarker::Read(CHWPStream& oStream)
bool CMarker::Read(CChartStream& oStream)
{
return m_oFillColor.Read(oStream) && m_oPen.Read(oStream) &&
oStream.ReadShort(m_snSize) && oStream.ReadInt(m_nStyle) &&
oStream.ReadBool(m_bVisible) && m_oVtPicture.Read(oStream);
oStream.ReadSingle(m_snSize) && oStream.ReadInteger(m_nStyle) &&
oStream.ReadBoolean(m_bVisible) && m_oVtPicture.Read(oStream);
}
}}

8
HwpFile/HwpDoc/Chart/Marker.h
View File

@ -10,14 +10,14 @@ class CMarker : public IChartObject
{
CVtColor m_oFillColor;
CPen m_oPen;
SINGLE m_snSize;
int m_nStyle;
bool m_bVisible;
CHART_SINGLE m_snSize;
CHART_INTEGER m_nStyle;
CHART_BOOLEAN m_bVisible;
CVtPicture m_oVtPicture;
public:
CMarker();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

8
HwpFile/HwpDoc/Chart/Pen.cpp
View File

@ -7,10 +7,10 @@ CPen::CPen()
}
bool CPen::Read(CHWPStream& oStream)
bool CPen::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nCap) && oStream.ReadInt(m_nJoin) &&
oStream.ReadShort(m_snLimit) && oStream.ReadInt(m_nStyle) &&
oStream.ReadShort(m_snWidth) && m_oVtColor.Read(oStream);
return oStream.ReadInteger(m_nCap) && oStream.ReadInteger(m_nJoin) &&
oStream.ReadSingle(m_snLimit) && oStream.ReadInteger(m_nStyle) &&
oStream.ReadSingle(m_snWidth) && m_oVtColor.Read(oStream);
}
}}

12
HwpFile/HwpDoc/Chart/Pen.h
View File

@ -7,16 +7,16 @@ namespace HWP { namespace CHART
{
class CPen : public IChartObject
{
int m_nCap;
int m_nJoin;
SINGLE m_snLimit;
int m_nStyle;
SINGLE m_snWidth;
CHART_INTEGER m_nCap;
CHART_INTEGER m_nJoin;
CHART_SINGLE m_snLimit;
CHART_INTEGER m_nStyle;
CHART_SINGLE m_snWidth;
CVtColor m_oVtColor;
public:
CPen();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Pie.cpp
View File

@ -7,8 +7,8 @@ CPie::CPie()
}
bool CPie::Read(CHWPStream& oStream)
bool CPie::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snThicknessRatio) && oStream.ReadShort(m_snTopRadiusRatio);
return oStream.ReadSingle(m_snThicknessRatio) && oStream.ReadSingle(m_snTopRadiusRatio);
}
}}

6
HwpFile/HwpDoc/Chart/Pie.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CPie : public IChartObject
{
SINGLE m_snThicknessRatio;
SINGLE m_snTopRadiusRatio;
CHART_SINGLE m_snThicknessRatio;
CHART_SINGLE m_snTopRadiusRatio;
public:
CPie();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

30
HwpFile/HwpDoc/Chart/Plot.cpp
View File

@ -7,9 +7,9 @@ CPlotBase::CPlotBase()
}
bool CPlotBase::Read(CHWPStream& oStream)
bool CPlotBase::Read(CChartStream& oStream)
{
return m_oBrush.Read(oStream) && oStream.ReadShort(m_snBaseHeight) && m_oPen.Read(oStream);
return m_oBrush.Read(oStream) && oStream.ReadSingle(m_snBaseHeight) && m_oPen.Read(oStream);
}
CPlot::CPlot()
@ -17,23 +17,23 @@ CPlot::CPlot()
}
bool CPlot::Read(CHWPStream& oStream)
bool CPlot::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nAngleUnit) && oStream.ReadBool(m_bAutoLayout) &&
return oStream.ReadInteger(m_nAngleUnit) && oStream.ReadBoolean(m_bAutoLayout) &&
m_oAxis.Read(oStream) && m_oBackdrop.Read(oStream) &&
oStream.ReadShort(m_snBarGap) && oStream.ReadBool(m_bClockwise) &&
oStream.ReadBool(m_bDataSeriesInRow) && oStream.ReadInt(m_nDefaultPercentBasis) &&
oStream.ReadShort(m_snDepthToHeightRatio) && m_oDoughnut.Read(oStream) &&
oStream.ReadSingle(m_snBarGap) && oStream.ReadBoolean(m_bClockwise) &&
oStream.ReadBoolean(m_bDataSeriesInRow) && oStream.ReadInteger(m_nDefaultPercentBasis) &&
oStream.ReadSingle(m_snDepthToHeightRatio) && m_oDoughnut.Read(oStream) &&
m_oElevation.Read(oStream) && m_oLight.Read(oStream) &&
m_oLocationRect.Read(oStream) && oStream.ReadShort(m_snMaxBubbleToAxisRatio) &&
m_oLocationRect.Read(oStream) && oStream.ReadSingle(m_snMaxBubbleToAxisRatio) &&
m_oPerspective.Read(oStream) && m_oPie.Read(oStream) &&
m_oPlotBase.Read(oStream) && oStream.ReadInt(m_nProjection) &&
oStream.ReadShort(m_snScaleAngle) && m_oSeries.Read(oStream) &&
oStream.ReadInt(m_nSort) && oStream.ReadShort(m_snStartingAngle) &&
oStream.ReadInt(m_nSubPlotLabelPosition) && oStream.ReadBool(m_bUniformAxis) &&
m_oPlotBase.Read(oStream) && oStream.ReadInteger(m_nProjection) &&
oStream.ReadSingle(m_snScaleAngle) && m_oSeries.Read(oStream) &&
oStream.ReadInteger(m_nSort) && oStream.ReadSingle(m_snStartingAngle) &&
oStream.ReadInteger(m_nSubPlotLabelPosition) && oStream.ReadBoolean(m_bUniformAxis) &&
m_oView3D.Read(oStream) && m_oWall.Read(oStream) &&
oStream.ReadShort(m_snWidthToHeightRatio) && m_oWeighting.Read(oStream) &&
oStream.ReadShort(m_snxGap) && m_oXYZ.Read(oStream) &&
oStream.ReadShort(m_snzGap);
oStream.ReadSingle(m_snWidthToHeightRatio) && m_oWeighting.Read(oStream) &&
oStream.ReadSingle(m_snxGap) && m_oXYZ.Read(oStream) &&
oStream.ReadSingle(m_snzGap);
}
}}

40
HwpFile/HwpDoc/Chart/Plot.h
View File

@ -22,51 +22,51 @@ namespace HWP { namespace CHART
class CPlotBase : public IChartObject
{
CBrush m_oBrush;
SINGLE m_snBaseHeight;
CHART_SINGLE m_snBaseHeight;
CPen m_oPen;
public:
CPlotBase();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CPlot : public IChartObject
{
int m_nAngleUnit;
bool m_bAutoLayout;
CHART_INTEGER m_nAngleUnit;
CHART_BOOLEAN m_bAutoLayout;
CAxis m_oAxis;
CBackdrop m_oBackdrop;
SINGLE m_snBarGap;
bool m_bClockwise;
bool m_bDataSeriesInRow;
int m_nDefaultPercentBasis;
SINGLE m_snDepthToHeightRatio;
CHART_SINGLE m_snBarGap;
CHART_BOOLEAN m_bClockwise;
CHART_BOOLEAN m_bDataSeriesInRow;
CHART_INTEGER m_nDefaultPercentBasis;
CHART_SINGLE m_snDepthToHeightRatio;
CCoor m_oDoughnut;
CElevation m_oElevation;
CLight m_oLight;
CRect m_oLocationRect;
SINGLE m_snMaxBubbleToAxisRatio;
CHART_SINGLE m_snMaxBubbleToAxisRatio;
CCoor3 m_oPerspective;
CPie m_oPie;
CPlotBase m_oPlotBase;
int m_nProjection;
SINGLE m_snScaleAngle;
CHART_INTEGER m_nProjection;
CHART_SINGLE m_snScaleAngle;
CSeries m_oSeries;
int m_nSort;
SINGLE m_snStartingAngle;
int m_nSubPlotLabelPosition;
bool m_bUniformAxis;
CHART_INTEGER m_nSort;
CHART_SINGLE m_snStartingAngle;
CHART_INTEGER m_nSubPlotLabelPosition;
CHART_BOOLEAN m_bUniformAxis;
CView3D m_oView3D;
CWall m_oWall;
SINGLE m_snWidthToHeightRatio;
CHART_SINGLE m_snWidthToHeightRatio;
CWeighting m_oWeighting;
SINGLE m_snxGap;
CHART_SINGLE m_snxGap;
CXYZ m_oXYZ;
SINGLE m_snzGap;
CHART_SINGLE m_snzGap;
public:
CPlot();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/Position.cpp
View File

@ -7,9 +7,9 @@ CPosition::CPosition()
}
bool CPosition::Read(CHWPStream& oStream)
bool CPosition::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bExcluded) && oStream.ReadBool(m_bHidden) &&
oStream.ReadInt(m_nOrder) && oStream.ReadInt(m_nStackOrder);
return oStream.ReadBoolean(m_bExcluded) && oStream.ReadBoolean(m_bHidden) &&
oStream.ReadInteger(m_nOrder) && oStream.ReadInteger(m_nStackOrder);
}
}}

10
HwpFile/HwpDoc/Chart/Position.h
View File

@ -7,14 +7,14 @@ namespace HWP { namespace CHART
{
class CPosition : public IChartObject
{
bool m_bExcluded;
bool m_bHidden;
int m_nOrder;
int m_nStackOrder;
CHART_BOOLEAN m_bExcluded;
CHART_BOOLEAN m_bHidden;
CHART_INTEGER m_nOrder;
CHART_INTEGER m_nStackOrder;
public:
CPosition();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

12
HwpFile/HwpDoc/Chart/PrintInformation.cpp
View File

@ -7,12 +7,12 @@ CPrintInformation::CPrintInformation()
}
bool CPrintInformation::Read(CHWPStream& oStream)
bool CPrintInformation::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snBottomMargin) && oStream.ReadBool(m_bCenterHorizontally) &&
oStream.ReadBool(m_bCenterVertically) && oStream.ReadBool(m_bLayoutForPrinter) &&
oStream.ReadShort(m_snLeftMargin) && oStream.ReadBool(m_bMonochrome) &&
oStream.ReadInt(m_nOrientation) && oStream.ReadShort(m_snRightMargin) &&
oStream.ReadInt(m_nScaleType) && oStream.ReadShort(m_snTopMargin);
return oStream.ReadSingle(m_snBottomMargin) && oStream.ReadBoolean(m_bCenterHorizontally) &&
oStream.ReadBoolean(m_bCenterVertically) && oStream.ReadBoolean(m_bLayoutForPrinter) &&
oStream.ReadSingle(m_snLeftMargin) && oStream.ReadBoolean(m_bMonochrome) &&
oStream.ReadInteger(m_nOrientation) && oStream.ReadSingle(m_snRightMargin) &&
oStream.ReadInteger(m_nScaleType) && oStream.ReadSingle(m_snTopMargin);
}
}}

22
HwpFile/HwpDoc/Chart/PrintInformation.h
View File

@ -7,20 +7,20 @@ namespace HWP { namespace CHART
{
class CPrintInformation : public IChartObject
{
SINGLE m_snBottomMargin;
bool m_bCenterHorizontally;
bool m_bCenterVertically;
bool m_bLayoutForPrinter;
SINGLE m_snLeftMargin;
bool m_bMonochrome;
int m_nOrientation;
SINGLE m_snRightMargin;
int m_nScaleType;
SINGLE m_snTopMargin;
CHART_SINGLE m_snBottomMargin;
CHART_BOOLEAN m_bCenterHorizontally;
CHART_BOOLEAN m_bCenterVertically;
CHART_BOOLEAN m_bLayoutForPrinter;
CHART_SINGLE m_snLeftMargin;
CHART_BOOLEAN m_bMonochrome;
CHART_INTEGER m_nOrientation;
CHART_SINGLE m_snRightMargin;
CHART_INTEGER m_nScaleType;
CHART_SINGLE m_snTopMargin;
public:
CPrintInformation();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

2
HwpFile/HwpDoc/Chart/Rect.cpp
View File

@ -7,7 +7,7 @@ CRect::CRect()
}
bool CRect::Read(CHWPStream& oStream)
bool CRect::Read(CChartStream& oStream)
{
return m_oMin.Read(oStream) && m_oMax.Read(oStream);
}

2
HwpFile/HwpDoc/Chart/Rect.h
View File

@ -12,7 +12,7 @@ class CRect : public IChartObject
public:
CRect();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

30
HwpFile/HwpDoc/Chart/Series.cpp
View File

@ -7,13 +7,12 @@ CSeriesLabel::CSeriesLabel()
}
bool CSeriesLabel::Read(CHWPStream& oStream)
bool CSeriesLabel::Read(CChartStream& oStream)
{
return m_oBackdrop.Read(oStream) && oStream.ReadInt(m_nLineStyle) &&
oStream.ReadInt(m_nLocationType) && m_oOffset.Read(oStream) &&
oStream.ReadString(m_sText, DEFAULT_STRING_CHARACTER) &&
m_oTextLayout.Read(oStream) && oStream.ReadShort(m_snTextLength) &&
m_oVtFont.Read(oStream);
return m_oBackdrop.Read(oStream) && oStream.ReadInteger(m_nLineStyle) &&
oStream.ReadInteger(m_nLocationType) && m_oOffset.Read(oStream) &&
oStream.ReadString(m_sText) && m_oTextLayout.Read(oStream) &&
oStream.ReadSingle(m_snTextLength) && m_oVtFont.Read(oStream);
}
CSeriesMarker::CSeriesMarker()
@ -21,9 +20,9 @@ CSeriesMarker::CSeriesMarker()
}
bool CSeriesMarker::Read(CHWPStream& oStream)
bool CSeriesMarker::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAuto) && oStream.ReadBool(m_bShow);
return oStream.ReadBoolean(m_bAuto) && oStream.ReadBoolean(m_bShow);
}
CSeries::CSeries()
@ -31,16 +30,15 @@ CSeries::CSeries()
}
bool CSeries::Read(CHWPStream& oStream)
bool CSeries::Read(CChartStream& oStream)
{
return m_oBar.Read(oStream) && m_oDataPoints.Read(oStream) &&
m_oGuidelinePen.Read(oStream) && m_oHiLo.Read(oStream) &&
oStream.ReadString(m_sLegendText, DEFAULT_STRING_CHARACTER) &&
m_oPen.Read(oStream) && m_oPosition.Read(oStream) &&
oStream.ReadBool(m_bSecondaryAxis) && m_oSeriesLabel.Read(oStream) &&
m_oSeriesMarker.Read(oStream) && oStream.ReadInt(m_nSeriesType) &&
oStream.ReadBool(m_bShowGuideLines) && oStream.ReadBool(m_bShowLine) &&
oStream.ReadInt(m_nSmoothingFactor) && oStream.ReadInt(m_nSmoothingType) &&
m_oStatLine.Read(oStream);
oStream.ReadString(m_sLegendText) && m_oPen.Read(oStream) &&
m_oPosition.Read(oStream) && oStream.ReadBoolean(m_bSecondaryAxis) &&
m_oSeriesLabel.Read(oStream) && m_oSeriesMarker.Read(oStream) &&
oStream.ReadInteger(m_nSeriesType) && oStream.ReadBoolean(m_bShowGuideLines) &&
oStream.ReadBoolean(m_bShowLine) && oStream.ReadInteger(m_nSmoothingFactor) &&
oStream.ReadInteger(m_nSmoothingType) && m_oStatLine.Read(oStream);
}
}}

28
HwpFile/HwpDoc/Chart/Series.h
View File

@ -13,17 +13,17 @@ namespace HWP { namespace CHART
class CSeriesLabel : public IChartObject
{
CBackdrop m_oBackdrop;
int m_nLineStyle;
int m_nLocationType;
CHART_INTEGER m_nLineStyle;
CHART_INTEGER m_nLocationType;
CCoor m_oOffset;
HWP_STRING m_sText;
CHART_STRING m_sText;
CTextLayout m_oTextLayout;
SINGLE m_snTextLength;
CHART_SINGLE m_snTextLength;
CVtFont m_oVtFont;
public:
CSeriesLabel();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CSeriesMarker : public IChartObject
@ -33,7 +33,7 @@ class CSeriesMarker : public IChartObject
public:
CSeriesMarker();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
class CSeries : public IChartObject
@ -42,22 +42,22 @@ class CSeries : public IChartObject
CDataPoints m_oDataPoints;
CPen m_oGuidelinePen;
CHiLo m_oHiLo;
HWP_STRING m_sLegendText;
CHART_STRING m_sLegendText;
CPen m_oPen;
CPosition m_oPosition;
bool m_bSecondaryAxis;
CHART_BOOLEAN m_bSecondaryAxis;
CSeriesLabel m_oSeriesLabel;
CSeriesMarker m_oSeriesMarker;
int m_nSeriesType;
bool m_bShowGuideLines;
bool m_bShowLine;
int m_nSmoothingFactor;
int m_nSmoothingType;
CHART_INTEGER m_nSeriesType;
CHART_BOOLEAN m_bShowGuideLines;
CHART_BOOLEAN m_bShowLine;
CHART_INTEGER m_nSmoothingFactor;
CHART_INTEGER m_nSmoothingType;
CStatLine m_oStatLine;
public:
CSeries();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Shadow.cpp
View File

@ -7,8 +7,8 @@ CShadow::CShadow()
}
bool CShadow::Read(CHWPStream& oStream)
bool CShadow::Read(CChartStream& oStream)
{
return m_oBrush.Read(oStream) && m_oOffset.Read(oStream) && oStream.ReadInt(m_nStyle);
return m_oBrush.Read(oStream) && m_oOffset.Read(oStream) && oStream.ReadInteger(m_nStyle);
}
}}

4
HwpFile/HwpDoc/Chart/Shadow.h
View File

@ -10,11 +10,11 @@ class CShadow : public IChartObject
{
CBrush m_oBrush;
CCoor m_oOffset;
int m_nStyle;
CHART_INTEGER m_nStyle;
public:
CShadow();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/StatLine.cpp
View File

@ -7,9 +7,9 @@ CStatLine::CStatLine()
}
bool CStatLine::Read(CHWPStream& oStream)
bool CStatLine::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nFlags) && oStream.ReadInt(m_nStyle) &&
m_oVtColor.Read(oStream) && oStream.ReadShort(m_snWidth);
return oStream.ReadInteger(m_nFlags) && oStream.ReadInteger(m_nStyle) &&
m_oVtColor.Read(oStream) && oStream.ReadSingle(m_snWidth);
}
}}

8
HwpFile/HwpDoc/Chart/StatLine.h
View File

@ -7,14 +7,14 @@ namespace HWP { namespace CHART
{
class CStatLine : public IChartObject
{
int m_nFlags;
int m_nStyle;
CHART_INTEGER m_nFlags;
CHART_INTEGER m_nStyle;
CVtColor m_oVtColor;
SINGLE m_snWidth;
CHART_SINGLE m_snWidth;
public:
CStatLine();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

8
HwpFile/HwpDoc/Chart/Surface.cpp
View File

@ -7,11 +7,11 @@ CSurface::CSurface()
}
bool CSurface::Read(CHWPStream& oStream)
bool CSurface::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nBase) && m_oBrush.Read(oStream) &&
oStream.ReadInt(m_nColWireframe) && oStream.ReadInt(m_nDisplayType) &&
oStream.ReadInt(m_nProjection) && oStream.ReadInt(m_nRowWireframe) &&
return oStream.ReadInteger(m_nBase) && m_oBrush.Read(oStream) &&
oStream.ReadInteger(m_nColWireframe) && oStream.ReadInteger(m_nDisplayType) &&
oStream.ReadInteger(m_nProjection) && oStream.ReadInteger(m_nRowWireframe) &&
m_oWireframePen.Read(oStream);
}
}}

12
HwpFile/HwpDoc/Chart/Surface.h
View File

@ -8,17 +8,17 @@ namespace HWP { namespace CHART
{
class CSurface : public IChartObject
{
int m_nBase;
CHART_INTEGER m_nBase;
CBrush m_oBrush;
int m_nColWireframe;
int m_nDisplayType;
int m_nProjection;
int m_nRowWireframe;
CHART_INTEGER m_nColWireframe;
CHART_INTEGER m_nDisplayType;
CHART_INTEGER m_nProjection;
CHART_INTEGER m_nRowWireframe;
CPen m_oWireframePen;
public:
CSurface();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/TextLayout.cpp
View File

@ -7,9 +7,9 @@ CTextLayout::CTextLayout()
}
bool CTextLayout::Read(CHWPStream& oStream)
bool CTextLayout::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bWordWrap) && oStream.ReadInt(m_nHorzAlignment) &&
oStream.ReadInt(m_nOrientation) && oStream.ReadInt(m_nVertAlignment);
return oStream.ReadBoolean(m_bWordWrap) && oStream.ReadInteger(m_nHorzAlignment) &&
oStream.ReadInteger(m_nOrientation) && oStream.ReadInteger(m_nVertAlignment);
}
}}

10
HwpFile/HwpDoc/Chart/TextLayout.h
View File

@ -7,14 +7,14 @@ namespace HWP { namespace CHART
{
class CTextLayout : public IChartObject
{
bool m_bWordWrap;
int m_nHorzAlignment;
int m_nOrientation;
int m_nVertAlignment;
CHART_BOOLEAN m_bWordWrap;
CHART_INTEGER m_nHorzAlignment;
CHART_INTEGER m_nOrientation;
CHART_INTEGER m_nVertAlignment;
public:
CTextLayout();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/Tick.cpp
View File

@ -7,8 +7,8 @@ CTick::CTick()
}
bool CTick::Read(CHWPStream& oStream)
bool CTick::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snLength) && oStream.ReadInt(m_nStyle);
return oStream.ReadSingle(m_snLength) && oStream.ReadInteger(m_nStyle);
}
}}

6
HwpFile/HwpDoc/Chart/Tick.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CTick : public IChartObject
{
SINGLE m_snLength;
int m_nStyle;
CHART_SINGLE m_snLength;
CHART_INTEGER m_nStyle;
public:
CTick();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

7
HwpFile/HwpDoc/Chart/Title.cpp
View File

@ -7,11 +7,10 @@ CTitle::CTitle()
}
bool CTitle::Read(CHWPStream& oStream)
bool CTitle::Read(CChartStream& oStream)
{
return m_oBackdrop.Read(oStream) && m_oLocation.Read(oStream) &&
oStream.ReadString(m_sText, DEFAULT_STRING_CHARACTER) &&
m_oTextLayout.Read(oStream) && oStream.ReadInt(m_nTextLength) &&
m_oVtFont.Read(oStream);
oStream.ReadString(m_sText) && m_oTextLayout.Read(oStream)
&& oStream.ReadInteger(m_nTextLength) && m_oVtFont.Read(oStream);
}
}}

6
HwpFile/HwpDoc/Chart/Title.h
View File

@ -12,14 +12,14 @@ class CTitle : public IChartObject
{
CBackdrop m_oBackdrop;
CLocation m_oLocation;
HWP_STRING m_sText;
CHART_STRING m_sText;
CTextLayout m_oTextLayout;
int m_nTextLength;
CHART_INTEGER m_nTextLength;
CVtFont m_oVtFont;
public:
CTitle();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

6
HwpFile/HwpDoc/Chart/ValueScale.cpp
View File

@ -7,10 +7,10 @@ CValueScale::CValueScale()
}
bool CValueScale::Read(CHWPStream& oStream)
bool CValueScale::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAuto) && oStream.ReadInt(m_nMajorDivision) &&
return oStream.ReadBoolean(m_bAuto) && oStream.ReadInteger(m_nMajorDivision) &&
oStream.ReadDouble(m_dMaximum) && oStream.ReadDouble(m_dMinimum) &&
oStream.ReadInt(m_nMinorDivision);
oStream.ReadInteger(m_nMinorDivision);
}
}}

12
HwpFile/HwpDoc/Chart/ValueScale.h
View File

@ -7,15 +7,15 @@ namespace HWP { namespace CHART
{
class CValueScale : public IChartObject
{
bool m_bAuto;
int m_nMajorDivision;
double m_dMaximum;
double m_dMinimum;
int m_nMinorDivision;
CHART_BOOLEAN m_bAuto;
CHART_INTEGER m_nMajorDivision;
CHART_DOUBLE m_dMaximum;
CHART_DOUBLE m_dMinimum;
CHART_INTEGER m_nMinorDivision;
public:
CValueScale();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

4
HwpFile/HwpDoc/Chart/View3D.cpp
View File

@ -7,8 +7,8 @@ CView3D::CView3D()
}
bool CView3D::Read(CHWPStream& oStream)
bool CView3D::Read(CChartStream& oStream)
{
return oStream.ReadShort(m_snElevation) && oStream.ReadShort(m_snRotation);
return oStream.ReadSingle(m_snElevation) && oStream.ReadSingle(m_snRotation);
}
}}

6
HwpFile/HwpDoc/Chart/View3D.h
View File

@ -7,12 +7,12 @@ namespace HWP { namespace CHART
{
class CView3D : public IChartObject
{
SINGLE m_snElevation;
SINGLE m_snRotation;
CHART_SINGLE m_snElevation;
CHART_SINGLE m_snRotation;
public:
CView3D();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}
#endif // VIEW3D_H

51
HwpFile/HwpDoc/Chart/VtChart.cpp
View File

@ -7,33 +7,30 @@ CVtChart::CVtChart()
}
bool CVtChart::Read(CHWPStream& oStream)
bool CVtChart::Read(CChartStream& oStream)
{
return oStream.ReadInt(m_nActiveSeriesCount) && oStream.ReadBool(m_bAllowDithering) &&
oStream.ReadBool(m_bAllowDynamicRotation) && oStream.ReadBool(m_bAllowSelections) &&
oStream.ReadBool(m_bAllowSeriesSelection) && oStream.ReadBool(m_bAllowUserChanges) &&
oStream.ReadBool(m_bAutoIncrement) && m_oBackdrop.Read(oStream) &&
oStream.ReadBool(m_bChart3d) && oStream.ReadInt(m_nChartType) &&
oStream.ReadInt(m_nColumn) && oStream.ReadInt(m_nColumnCount) &&
oStream.ReadString(m_sColumnLabel, DEFAULT_STRING_CHARACTER) &&
oStream.ReadInt(m_nColumnLabelCount) && oStream.ReadInt(m_nColumnLabelIndex) &&
oStream.ReadString(m_sData, DEFAULT_STRING_CHARACTER) &&
m_oDataGrid.Read(oStream) && oStream.ReadBool(m_bDoSetCursor) &&
oStream.ReadInt(m_nDrawMode) && oStream.ReadInt(m_nErrorOffset) &&
oStream.ReadString(m_sFileName, DEFAULT_STRING_CHARACTER) &&
m_oFootnote.Read(oStream) && oStream.ReadString(m_sFootnoteText, DEFAULT_STRING_CHARACTER) &&
oStream.ReadLong(m_lHandle) && m_oLegend.Read(oStream) &&
oStream.ReadInt(m_nPicture) && m_oPlot.Read(oStream) &&
m_oPrintInformation.Read(oStream) && oStream.ReadBool(m_bRandomFill) &&
oStream.ReadBool(m_bRepaint) && oStream.ReadInt(m_nRow) &&
oStream.ReadInt(m_nRowCount) && oStream.ReadString(m_sRowLabel, DEFAULT_STRING_CHARACTER) &&
oStream.ReadInt(m_nRowLabelCount) && oStream.ReadInt(m_nRowLabelIndex) &&
oStream.ReadInt(m_nSeriesColumn) && oStream.ReadInt(m_nSeriesType) &&
oStream.ReadBool(m_bShowLegend) && oStream.ReadInt(m_nSsLinkMode) &&
oStream.ReadString(m_sSsLinkRange, DEFAULT_STRING_CHARACTER) &&
oStream.ReadString(m_sSsLinkBook, DEFAULT_STRING_CHARACTER) &&
oStream.ReadBool(m_bStacking) && oStream.ReadInt(m_nTextLengthType) &&
m_oTitle.Read(oStream) && oStream.ReadString(m_sTitleText, DEFAULT_STRING_CHARACTER) &&
oStream.ReadInt(m_nTwipsWidth) && oStream.ReadInt(m_nTwipsHeight);
return oStream.ReadInteger(m_nActiveSeriesCount) && oStream.ReadBoolean(m_bAllowDithering) &&
oStream.ReadBoolean(m_bAllowDynamicRotation) && oStream.ReadBoolean(m_bAllowSelections) &&
oStream.ReadBoolean(m_bAllowSeriesSelection) && oStream.ReadBoolean(m_bAllowUserChanges) &&
oStream.ReadBoolean(m_bAutoIncrement) && m_oBackdrop.Read(oStream) &&
oStream.ReadBoolean(m_bChart3d) && oStream.ReadInteger(m_nChartType) &&
oStream.ReadInteger(m_nColumn) && oStream.ReadInteger(m_nColumnCount) &&
oStream.ReadString(m_sColumnLabel) && oStream.ReadInteger(m_nColumnLabelCount)
&& oStream.ReadInteger(m_nColumnLabelIndex) && oStream.ReadString(m_sData) &&
m_oDataGrid.Read(oStream) && oStream.ReadBoolean(m_bDoSetCursor) &&
oStream.ReadInteger(m_nDrawMode) && oStream.ReadInteger(m_nErrorOffset) &&
oStream.ReadString(m_sFileName) && m_oFootnote.Read(oStream) &&
oStream.ReadString(m_sFootnoteText) && oStream.ReadInteger(m_nPicture) &&
m_oPlot.Read(oStream) && m_oPrintInformation.Read(oStream) &&
oStream.ReadBoolean(m_bRandomFill) && oStream.ReadBoolean(m_bRepaint) &&
oStream.ReadInteger(m_nRow) && oStream.ReadInteger(m_nRowCount) &&
oStream.ReadString(m_sRowLabel) && oStream.ReadInteger(m_nRowLabelCount) &&
oStream.ReadInteger(m_nRowLabelIndex) && oStream.ReadInteger(m_nSeriesColumn) &&
oStream.ReadInteger(m_nSeriesType) && oStream.ReadBoolean(m_bShowLegend) &&
oStream.ReadInteger(m_nSsLinkMode) && oStream.ReadString(m_sSsLinkRange) &&
oStream.ReadString(m_sSsLinkBook) && oStream.ReadBoolean(m_bStacking) &&
oStream.ReadInteger(m_nTextLengthType) && m_oTitle.Read(oStream) &&
oStream.ReadString(m_sTitleText) && oStream.ReadInteger(m_nTwipsWidth) &&
oStream.ReadInteger(m_nTwipsHeight);
}
}}

82
HwpFile/HwpDoc/Chart/VtChart.h
View File

@ -13,57 +13,57 @@ namespace HWP { namespace CHART
{
class CVtChart : public IChartObject
{
int m_nActiveSeriesCount;
bool m_bAllowDithering;
bool m_bAllowDynamicRotation;
bool m_bAllowSelections;
bool m_bAllowSeriesSelection;
bool m_bAllowUserChanges;
bool m_bAutoIncrement;
CHART_INTEGER m_nActiveSeriesCount;
CHART_BOOLEAN m_bAllowDithering;
CHART_BOOLEAN m_bAllowDynamicRotation;
CHART_BOOLEAN m_bAllowSelections;
CHART_BOOLEAN m_bAllowSeriesSelection;
CHART_BOOLEAN m_bAllowUserChanges;
CHART_BOOLEAN m_bAutoIncrement;
CBackdrop m_oBackdrop;
bool m_bChart3d;
int m_nChartType;
int m_nColumn;
int m_nColumnCount;
HWP_STRING m_sColumnLabel;
int m_nColumnLabelCount;
int m_nColumnLabelIndex;
HWP_STRING m_sData;
CHART_BOOLEAN m_bChart3d;
CHART_INTEGER m_nChartType;
CHART_INTEGER m_nColumn;
CHART_INTEGER m_nColumnCount;
CHART_STRING m_sColumnLabel;
CHART_INTEGER m_nColumnLabelCount;
CHART_INTEGER m_nColumnLabelIndex;
CHART_STRING m_sData;
CDataGrid m_oDataGrid;
bool m_bDoSetCursor;
int m_nDrawMode;
int m_nErrorOffset;
HWP_STRING m_sFileName;
CHART_BOOLEAN m_bDoSetCursor;
CHART_INTEGER m_nDrawMode;
CHART_INTEGER m_nErrorOffset;
CHART_STRING m_sFileName;
CFootnote m_oFootnote;
HWP_STRING m_sFootnoteText;
long m_lHandle;
CHART_STRING m_sFootnoteText;
CHART_LONG m_lHandle;
CLegend m_oLegend;
int m_nPicture;
CHART_INTEGER m_nPicture;
CPlot m_oPlot;
CPrintInformation m_oPrintInformation;
bool m_bRandomFill;
bool m_bRepaint;
int m_nRow;
int m_nRowCount;
HWP_STRING m_sRowLabel;
int m_nRowLabelCount;
int m_nRowLabelIndex;
int m_nSeriesColumn;
int m_nSeriesType;
bool m_bShowLegend;
int m_nSsLinkMode;
HWP_STRING m_sSsLinkRange;
HWP_STRING m_sSsLinkBook;
bool m_bStacking;
int m_nTextLengthType;
CHART_BOOLEAN m_bRandomFill;
CHART_BOOLEAN m_bRepaint;
CHART_INTEGER m_nRow;
CHART_INTEGER m_nRowCount;
CHART_STRING m_sRowLabel;
CHART_INTEGER m_nRowLabelCount;
CHART_INTEGER m_nRowLabelIndex;
CHART_INTEGER m_nSeriesColumn;
CHART_INTEGER m_nSeriesType;
CHART_BOOLEAN m_bShowLegend;
CHART_INTEGER m_nSsLinkMode;
CHART_STRING m_sSsLinkRange;
CHART_STRING m_sSsLinkBook;
CHART_BOOLEAN m_bStacking;
CHART_INTEGER m_nTextLengthType;
CTitle m_oTitle;
HWP_STRING m_sTitleText;
int m_nTwipsWidth;
int m_nTwipsHeight;
CHART_STRING m_sTitleText;
CHART_INTEGER m_nTwipsWidth;
CHART_INTEGER m_nTwipsHeight;
public:
CVtChart();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

7
HwpFile/HwpDoc/Chart/VtColor.cpp
View File

@ -7,9 +7,10 @@ CVtColor::CVtColor()
}
bool CVtColor::Read(CHWPStream& oStream)
bool CVtColor::Read(CChartStream& oStream)
{
return oStream.ReadBool(m_bAutomatic) && oStream.ReadInt(m_nBlue) &&
oStream.ReadInt(m_nGreen) && oStream.ReadInt(m_nRed) && oStream.ReadInt(m_nValue);
return oStream.ReadBoolean(m_bAutomatic) && oStream.ReadInteger(m_nBlue) &&
oStream.ReadInteger(m_nGreen) && oStream.ReadInteger(m_nRed) &&
oStream.ReadInteger(m_nValue);
}
}}

12
HwpFile/HwpDoc/Chart/VtColor.h
View File

@ -7,15 +7,15 @@ namespace HWP { namespace CHART
{
class CVtColor : public IChartObject
{
bool m_bAutomatic;
int m_nBlue;
int m_nGreen;
int m_nRed;
int m_nValue;
CHART_BOOLEAN m_bAutomatic;
CHART_INTEGER m_nBlue;
CHART_INTEGER m_nGreen;
CHART_INTEGER m_nRed;
CHART_INTEGER m_nValue;
public:
CVtColor();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

8
HwpFile/HwpDoc/Chart/VtFont.cpp
View File

@ -7,10 +7,10 @@ CVtFont::CVtFont()
}
bool CVtFont::Read(CHWPStream& oStream)
bool CVtFont::Read(CChartStream& oStream)
{
return m_oColor.Read(oStream) && oStream.ReadInt(m_nEffects) &&
oStream.ReadString(m_sName, DEFAULT_STRING_CHARACTER) &&
oStream.ReadShort(m_snSize) && oStream.ReadInt(m_nStyle);
return m_oColor.Read(oStream) && oStream.ReadInteger(m_nEffects) &&
oStream.ReadString(m_sName) && oStream.ReadSingle(m_snSize) &&
oStream.ReadInteger(m_nStyle);
}
}}

10
HwpFile/HwpDoc/Chart/VtFont.h
View File

@ -8,14 +8,14 @@ namespace HWP { namespace CHART
class CVtFont : public IChartObject
{
CVtColor m_oColor;
int m_nEffects;
HWP_STRING m_sName;
SINGLE m_snSize;
int m_nStyle;
CHART_INTEGER m_nEffects;
CHART_STRING m_sName;
CHART_SINGLE m_snSize;
CHART_INTEGER m_nStyle;
public:
CVtFont();
bool Read(CHWPStream& oStream) override;
bool Read(CChartStream& oStream) override;
};
}}

Some files were not shown because too many files have changed in this diff Show More