Commit be6f5a78 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

XlsFile2

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63540 954022d7-b5bf-4e40-9824-e11837661b57
parent 1a7f397c
......@@ -402,8 +402,6 @@ ASCOfficeXlsFile2/source/XlsFormat/Binary svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Crypt svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Crypt/rtl svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Document svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Document/msxml svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/FormatFactory svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Logging svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Logic svnc_tsvn_003alogminsize=5
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records svnc_tsvn_003alogminsize=5
#include "stdafx.h"
#include "EWSDocument.h"
#include "Document.h"
#include <FormatFactory/Producer.h>
#include <Serializer/Serializer.h>
#include <Converter/Converter.h>
#include <Exception/exceptions.h>
namespace EWSCORE
{;
EWSDocument::EWSDocument()
{
doc_ = new Document(L"root");
}
EWSDocument::~EWSDocument()
{
delete doc_;
}
bool EWSDocument::loadFrom(const _bstr_t& from_filename, const EWS_FORMAT format)
{
try
{
#ifdef _DEBUG
DWORD time_before = GetTickCount();
#endif
if(Producer::getSerializer(format).read(*doc_, from_filename))
{
#ifdef _DEBUG
DWORD ticks_spent = GetTickCount() - time_before;
Log::info("Binary reading took " + STR::int2str(ticks_spent / 1000) + " seconds (" + STR::int2str(ticks_spent) + " ms)");
Producer::getSerializer(ef_XML).write(*doc_, from_filename + L"_in.xml");
#endif
if(Producer::getConverter(format).convertToX(*doc_))
{
return true;
}
}
return false;
}
catch(EXCEPT::LogicalException&)
{
return false;
}
catch(EXCEPT::RuntimeException&)
{
return false;
}
catch(EXCEPT::StopConversionException&)
{
Log::error("Conversion stopped.");
return false;
}
catch(_com_error error)
{
std::string additional_descr = error.Description().length() ? std::string("Description: ") + static_cast<char*>(error.Description()) : "";
Log::error(std::string("_com_error exception!!! HRESULT: ") + STR::int2hex_str(error.Error()) + "(" + static_cast<char*>(_bstr_t(error.ErrorMessage())) + ") "+ additional_descr);
return false;
}
}
bool EWSDocument::saveTo(const _bstr_t& to_folder, const EWS_FORMAT format)
{
try
{
if(Producer::getConverter(format).convertFromX(*doc_))
{
#ifdef _DEBUG
Producer::getSerializer(ef_XML).write(*doc_, to_folder + L"_out.xml");
#endif
if(Producer::getSerializer(format).write(*doc_, to_folder))
{
return true;
}
}
return false;
}
catch(EXCEPT::LogicalException&)
{
return false;
}
catch(EXCEPT::RuntimeException&)
{
return false;
}
catch(EXCEPT::StopConversionException&)
{
Log::error("Conversion stopped.");
return false;
}
catch(_com_error error)
{
std::string additional_descr = error.Description().length() ? std::string("Description: ") + static_cast<char*>(error.Description()) : "";
Log::error(std::string("_com_error exception!!! HRESULT: ") + STR::int2hex_str(error.Error()) + "(" + static_cast<char*>(_bstr_t(error.ErrorMessage())) + ") "+ additional_descr);
return false;
}
}
}
\ No newline at end of file
#pragma once
typedef enum {
ef_XLS,
ef_XLSX,
ef_ODS,
ef_SXC,
ef_XML,
ef_AUTO_DETECT,
ef_END
} EWS_FORMAT;
class Document;
namespace EWSCORE
{;
class EWSDocument
{
public:
EWSDocument();
~EWSDocument();
public:
bool loadFrom(const _bstr_t& from_filename, const EWS_FORMAT format);
bool saveTo(const _bstr_t& to_folder, const EWS_FORMAT format);
private:
Document* doc_;
};
}
#include "stdafx.h"
#include "MSXMLErrHandler.h"
#include <Exception/MSXMLError.h>
namespace MSXML2
{;
MSXMLErrHandler::MSXMLErrHandler(const HRESULT hres, IXMLDOMNode* object, REFIID iid, const std::string& func_name)
: hres_(hres),
object_(object),
iid_(iid),
func_name_(func_name)
{
}
MSXMLErrHandler::~MSXMLErrHandler()
{
}
const std::string& MSXMLErrHandler::toString()
{
if(!message.empty())
{
return message;
}
if (S_OK == hres_)
{
return message; // I assume it is empty here always
}
IXMLDOMDocument3Ptr document = object_->GetownerDocument();
if(!document)
{
document = IXMLDOMDocument3Ptr(object_);
}
IXMLDOMParseErrorPtr error = document->GetparseError();
_bstr_t reason = error->Getreason();
if(!reason)
{
message = func_name_ + " failed! Unknown error! HRESULT = " + STR::int2hex_str(hres_);
}
else
{
message = func_name_ + " failed! Error code: 0x" + STR::int2hex_str(error->GeterrorCode()) +
" Line: " + STR::int2str(error->Getline()) + " Message: " + static_cast<char*>(error->Getreason());
}
return message;
}
void MSXMLErrHandler::logErrorAndThrow(bool force_throw)
{
toString();
if(FAILED(hres_) || force_throw)
{
Log::error(message);
_com_issue_errorex(hres_, object_, iid_);
}
if (S_FALSE == hres_)
{
Log::warning(message);
}
}
} // namespace MSXML2
\ No newline at end of file
#pragma once
namespace MSXML2
{;
class MSXMLErrHandler
{
public:
MSXMLErrHandler(const HRESULT hres, IXMLDOMNode* object, REFIID iid, const std::string& func_name);
~MSXMLErrHandler();
const std::string& toString();
void logErrorAndThrow(bool force_throw = false);
private:
HRESULT hres_;
IXMLDOMNodePtr object_;
IID iid_;
std::string func_name_;
std::string message;
};
} // namespace MSXML2
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
#include "stdafx.h"
#include "Producer.h"
#include <Serializer/XLSSerializer.h>
#include <Serializer/XLSXSerializer.h>
#include <Serializer/XMLSerializer.h>
#include <Converter/XLSConverter.h>
#include <Converter/XLSXConverter.h>
Producer::~Producer()
{
}
Serializer& Producer::getSerializer(const EWS_FORMAT format)
{
switch(format)
{
case ef_XLS:
{
static XLS::XLSSerializer prod;
return prod;
}
case ef_XML:
{
static XLS::XMLSerializer prod;
return prod;
}
case ef_XLSX:
default:
{
static XLSX::XLSXSerializer prod;
return prod;
}
}
}
Converter& Producer::getConverter(const EWS_FORMAT format)
{
switch(format)
{
case ef_XLS:
{
static XLS::XLSConverter prod;
return prod;
}
case ef_XLSX:
default:
{
static XLSX::XLSXConverter prod;
return prod;
}
}
}
#pragma once
#include <Document/EWSDocument.h> // EWS_FORMAT
class Serializer;
class Converter;
class Producer
{
~Producer();
public:
static Serializer& getSerializer(const EWS_FORMAT format);
static Converter& getConverter(const EWS_FORMAT format);
};
......@@ -24,17 +24,10 @@ public:
boost::shared_ptr<char> raw_data;
size_t raw_data_size;
public:
BO_ATTRIB_MARKUP_BEGIN
//xml_tag->Puttext(STR::bin2str(raw_data.get(), raw_data_size).c_str());
//CDllLog *log = new CDllLog(L"c:\\Temp\\for_test\\OutFiles\\log.txt", 1);
//log->write((char*)(tag_name.c_str()), (char*)STR::int2str(raw_data_size, 10).c_str());
//delete log;
Log::info("<" + tag_name + ">" + STR::bin2str(raw_data.get(), raw_data_size) + "</" + tag_name + ">");
BO_ATTRIB_MARKUP_END
static const ElementType type = typeAnyObject;
//Log::info("<" + tag_name + ">" + STR::bin2str(raw_data.get(), raw_data_size) + "</" + tag_name + ">");
};
} // namespace XLS
......@@ -18,6 +18,8 @@ public:
virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeAnySubstream;
};
} // namespace XLS
......
#pragma once
//#include <boost/enable_shared_from_this.hpp>
#include <boost/shared_ptr.hpp>
#include <list>
#include <sstream>
#include "Logging/Log.h"
#include "XlsElementsType.h" //
namespace XLS
{;
......@@ -27,23 +31,30 @@ public:
virtual const bool read(CFStreamCacheReader& reader, BaseObject* parent, const bool mandatory) = 0; // Read self and children
virtual void toFrom(BinProcessor& proc) = 0; // This function shall contain only mark functions and is the universal XML serialiser
//virtual void toFrom(BinProcessor& proc) = 0; // This function shall contain only mark functions and is the universal XML serialiser
virtual const std::wstring & getClassName() const = 0; // Must be overridden in every deriver. The return value must be a reference to a static variable inside the getter
void add_child (BaseObjectPtr e) {elements_.push_back(e);}
std::list<BaseObjectPtr> elements_;
virtual ElementType get_type() = 0;
virtual int serialize(std::wostream & _stream)
{
std::wstringstream s;
s << std::wstring(L"This element - ") << getClassName() << std::wstring(L"- not serialize");
Log::warning(s.str());
return 0;
}
};
#define BO_ATTRIB_MARKUP_BEGIN void toFrom(BinProcessor& proc) {
#define BO_ATTRIB_MARKUP_ATTRIB(attr) /*(attr).toXML(proc.getParent(), L# attr); */{static std::wstring attr ## _str(L# attr); proc.markAttribute(attr, attr ## _str);}
#define BO_ATTRIB_MARKUP_ATTRIB_NAME(attr, name) /*(attr).toXML(proc.getParent(), name);*/ proc.markAttribute(attr, name);
#define BO_ATTRIB_MARKUP_COMPLEX(attr) /*(attr).toXML(proc.getParent(), L# attr);*/ proc.markTaggedAttribute(attr);
#define BO_ATTRIB_MARKUP_VECTOR_COMPLEX(vec, class_name) proc.markVector(vec, class_name());
#define BO_ATTRIB_MARKUP_END }
#define BASE_OBJECT_DEFINE_CLASS_NAME(class_name)\
public: const std::wstring & getClassName() const { static std::wstring str(L# class_name); return str; };\
virtual ElementType get_type() { return type; }
#define BASE_OBJECT_DEFINE_CLASS_NAME(class_name) public: const std::wstring & getClassName() const { static std::wstring str(L# class_name); return str; }
#define BASE_OBJECT_DEFINE_CLASS_TYPE(class_name) public: const int & getClassType() const { static std::wstring str(L# class_name); return str; }
typedef enum
{
......
......@@ -20,12 +20,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAlRuns;
BiffStructurePtrVector rgRuns;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_VECTOR_COMPLEX(rgRuns, FormatRun)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,16 +19,13 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeArea;
BIFF_BOOL fStacked;
BIFF_BOOL f100;
BIFF_BOOL fHasShadow;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fStacked)
BO_ATTRIB_MARKUP_ATTRIB(f100)
BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
BO_ATTRIB_MARKUP_END
};
......
......@@ -20,7 +20,9 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAreaFormat;
LongRGB rgbFore;
LongRGB rgbBack;
BIFF_WORD fls;
......@@ -28,16 +30,7 @@ private:
BIFF_BOOL fInvertNeg;
IcvChart icvFore;
IcvChart icvBack;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(rgbFore)
BO_ATTRIB_MARKUP_COMPLEX(rgbBack)
BO_ATTRIB_MARKUP_ATTRIB(fls)
BO_ATTRIB_MARKUP_ATTRIB(fAuto)
BO_ATTRIB_MARKUP_ATTRIB(fInvertNeg)
BO_ATTRIB_MARKUP_ATTRIB(icvFore)
BO_ATTRIB_MARKUP_ATTRIB(icvBack)
BO_ATTRIB_MARKUP_END
};
......
......@@ -21,16 +21,12 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeArray;
Ref ref_;
BIFF_BOOL fAlwaysCalc;
ArrayParsedFormula formula;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(ref_)
BO_ATTRIB_MARKUP_ATTRIB(fAlwaysCalc)
BO_ATTRIB_MARKUP_COMPLEX(formula)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,7 +19,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAttachedLabel;
//-----------------------------
BIFF_BOOL fShowValue;
BIFF_BOOL fShowPercent;
BIFF_BOOL fShowLabelAndPerc;
......@@ -27,14 +30,14 @@ private:
BIFF_BOOL fShowBubbleSizes;
BIFF_BOOL fShowSeriesName;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fShowValue)
BO_ATTRIB_MARKUP_ATTRIB(fShowPercent)
BO_ATTRIB_MARKUP_ATTRIB(fShowLabelAndPerc)
BO_ATTRIB_MARKUP_ATTRIB(fShowLabel)
BO_ATTRIB_MARKUP_ATTRIB(fShowBubbleSizes)
BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fShowValue)
//BO_ATTRIB_MARKUP_ATTRIB(fShowPercent)
//BO_ATTRIB_MARKUP_ATTRIB(fShowLabelAndPerc)
//BO_ATTRIB_MARKUP_ATTRIB(fShowLabel)
//BO_ATTRIB_MARKUP_ATTRIB(fShowBubbleSizes)
//BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS
......
......@@ -21,6 +21,8 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeAutoFilter;
BIFF_WORD iEntry;
BIFF_BYTE wJoin;
BIFF_BYTE fSimple1;
......@@ -37,34 +39,24 @@ public:
XLUnicodeStringNoCch str1;
XLUnicodeStringNoCch str2;
private:
//-----------------------------
//if (!m_bAutoFilter12)
//{
// if (fSimple1)
// {
// //BO_ATTRIB_MARKUP_ATTRIB(str1)
// //BO_ATTRIB_MARKUP_COMPLEX(doper1)
// }
// if (fSimple2)
// {
// //BO_ATTRIB_MARKUP_ATTRIB(str2)
// //BO_ATTRIB_MARKUP_COMPLEX(doper2)
// }
//}
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(iEntry)
BO_ATTRIB_MARKUP_ATTRIB(wJoin)
BO_ATTRIB_MARKUP_ATTRIB(fSimple1)
BO_ATTRIB_MARKUP_ATTRIB(fSimple2)
BO_ATTRIB_MARKUP_ATTRIB(fTopN)
BO_ATTRIB_MARKUP_ATTRIB(fTop)
BO_ATTRIB_MARKUP_ATTRIB(fPercent)
BO_ATTRIB_MARKUP_ATTRIB(wTopN)
if (!m_bAutoFilter12)
{
if (fSimple1)
{
BO_ATTRIB_MARKUP_ATTRIB(str1)
BO_ATTRIB_MARKUP_COMPLEX(doper1)
}
if (fSimple2)
{
BO_ATTRIB_MARKUP_ATTRIB(str2)
BO_ATTRIB_MARKUP_COMPLEX(doper2)
}
}
BO_ATTRIB_MARKUP_END
};
......
......@@ -25,7 +25,8 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
public:
static const ElementType type = typeAutoFilter12;
FrtRefHeader frtRefHeader;
BIFF_WORD iEntry;
BIFF_DWORD fHideArrow;
......@@ -36,25 +37,15 @@ public:
BIFF_DWORD idList;
BiffStructurePtrVector rgbAF12Criteries;
private:
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(frtRefHeader)
BO_ATTRIB_MARKUP_ATTRIB(iEntry)
BO_ATTRIB_MARKUP_ATTRIB(fHideArrow)
BO_ATTRIB_MARKUP_ATTRIB(ft)
BO_ATTRIB_MARKUP_ATTRIB(cft)
BO_ATTRIB_MARKUP_ATTRIB(cCriteria)
BO_ATTRIB_MARKUP_ATTRIB(cDateGroupings)
BO_ATTRIB_MARKUP_ATTRIB(idList)
if ( (ft == BIFF_DWORD(0)) && (cCriteria > 0) )
{
BO_ATTRIB_MARKUP_VECTOR_COMPLEX(rgbAF12Criteries, AF12Criteria)
}
BO_ATTRIB_MARKUP_END
//if ( (ft == BIFF_DWORD(0)) && (cCriteria > 0) )
//{
// //BO_ATTRIB_MARKUP_VECTOR_COMPLEX(rgbAF12Criteries, AF12Criteria)
//}
};
......
......@@ -11,7 +11,9 @@ class AutoFilterInfo: public BiffRecord
{
BIFF_RECORD_DEFINE_TYPE_INFO(AutoFilterInfo)
BASE_OBJECT_DEFINE_CLASS_NAME(AutoFilterInfo)
public:
static const ElementType type = typeAutoFilterInfo;
AutoFilterInfo();
~AutoFilterInfo();
......@@ -19,12 +21,8 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
//-----------------------------
BIFF_WORD cEntries;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(cEntries)
BO_ATTRIB_MARKUP_END
};
......
......@@ -15,11 +15,14 @@ public:
AxcExt();
~AxcExt();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAxcExt;
//-----------------------------
BIFF_WORD catMin;
BIFF_WORD catMax;
BIFF_WORD catMajor;
......@@ -29,34 +32,15 @@ private:
BIFF_WORD duBase;
BIFF_WORD catCrossDate;
BIFF_BOOL fAutoMin;
BIFF_BOOL fAutoMax;
BIFF_BOOL fAutoMajor;
BIFF_BOOL fAutoMinor;
BIFF_BOOL fDateAxis;
BIFF_BOOL fAutoBase;
BIFF_BOOL fAutoCross;
BIFF_BOOL fAutoDate;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(catMin)
BO_ATTRIB_MARKUP_ATTRIB(catMax)
BO_ATTRIB_MARKUP_ATTRIB(catMajor)
BO_ATTRIB_MARKUP_ATTRIB(duMajor)
BO_ATTRIB_MARKUP_ATTRIB(catMinor)
BO_ATTRIB_MARKUP_ATTRIB(duMinor)
BO_ATTRIB_MARKUP_ATTRIB(duBase)
BO_ATTRIB_MARKUP_ATTRIB(catCrossDate)
BO_ATTRIB_MARKUP_ATTRIB(fAutoMin)
BO_ATTRIB_MARKUP_ATTRIB(fAutoMax)
BO_ATTRIB_MARKUP_ATTRIB(fAutoMajor)
BO_ATTRIB_MARKUP_ATTRIB(fAutoMinor)
BO_ATTRIB_MARKUP_ATTRIB(fDateAxis)
BO_ATTRIB_MARKUP_ATTRIB(fAutoBase)
BO_ATTRIB_MARKUP_ATTRIB(fAutoCross)
BO_ATTRIB_MARKUP_ATTRIB(fAutoDate)
BO_ATTRIB_MARKUP_END
BIFF_BOOL fAutoMin;
BIFF_BOOL fAutoMax;
BIFF_BOOL fAutoMajor;
BIFF_BOOL fAutoMinor;
BIFF_BOOL fDateAxis;
BIFF_BOOL fAutoBase;
BIFF_BOOL fAutoCross;
BIFF_BOOL fAutoDate;
};
} // namespace XLS
......
......@@ -19,12 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAxesUsed;
//-----------------------------
BIFF_WORD cAxes;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(cAxes)
BO_ATTRIB_MARKUP_END
};
......
......@@ -15,16 +15,15 @@ public:
Axis();
~Axis();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAxis;;
//-----------------------------
BIFF_WORD wType;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(wType)
BO_ATTRIB_MARKUP_END
};
......
......@@ -15,17 +15,15 @@ public:
AxisLine();
~AxisLine();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
BIFF_WORD id;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(id)
BO_ATTRIB_MARKUP_END
static const ElementType type = typeAxisLine;
//-----------------------------
BIFF_WORD id;
};
} // namespace XLS
......
......@@ -19,12 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeAxisParent;
//-----------------------------
Boolean<unsigned __int16> iax;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(iax)
BO_ATTRIB_MARKUP_END
};
......
......@@ -22,6 +22,8 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeBOF;
unsigned __int16 getSubstreamType();
typedef enum
......@@ -34,9 +36,8 @@ public:
st_Macro = 0x040
} SubstreamType;
// MSXML2::IXMLDOMElementPtr createElement(const std::string& substream_name);
private:
//-----------------------------
BIFF_WORD vers;
BIFF_WORD dt;
BIFF_WORD rupBuild;
......@@ -56,30 +57,6 @@ private:
BIFF_BYTE verLastXLSaved;
ForwardOnlyParam<unsigned int> stream_ptr;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(vers)
BO_ATTRIB_MARKUP_ATTRIB(dt)
BO_ATTRIB_MARKUP_ATTRIB(rupBuild)
BO_ATTRIB_MARKUP_ATTRIB(rupYear)
BO_ATTRIB_MARKUP_ATTRIB(fWin)
BO_ATTRIB_MARKUP_ATTRIB(fRisc)
BO_ATTRIB_MARKUP_ATTRIB(fBeta)
BO_ATTRIB_MARKUP_ATTRIB(fWinAny)
BO_ATTRIB_MARKUP_ATTRIB(fMacAny)
BO_ATTRIB_MARKUP_ATTRIB(fBetaAny)
BO_ATTRIB_MARKUP_ATTRIB(fRiscAny)
BO_ATTRIB_MARKUP_ATTRIB(fOOM)
BO_ATTRIB_MARKUP_ATTRIB(fGlJmp)
BO_ATTRIB_MARKUP_ATTRIB(fFontLimit)
BO_ATTRIB_MARKUP_ATTRIB(verXLHigh)
BO_ATTRIB_MARKUP_ATTRIB(verLowestBiff)
BO_ATTRIB_MARKUP_ATTRIB(verLastXLSaved)
BO_ATTRIB_MARKUP_ATTRIB(stream_ptr)
BO_ATTRIB_MARKUP_END
};
} // namespace XLS
......
......@@ -20,21 +20,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBRAI;
//-----------------------------
BIFF_BYTE id;
BIFF_BYTE rt;
BIFF_BOOL fUnlinkedIfmt;
IFmt ifmt;
ChartParsedFormula formula;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(id)
BO_ATTRIB_MARKUP_ATTRIB(rt)
BO_ATTRIB_MARKUP_ATTRIB(fUnlinkedIfmt)
BO_ATTRIB_MARKUP_ATTRIB(ifmt)
BO_ATTRIB_MARKUP_COMPLEX(formula)
BO_ATTRIB_MARKUP_END
};
} // namespace XLS
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBackup;
//-----------------------------
Boolean<unsigned __int16> fBackup;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fBackup)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fBackup)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -15,29 +15,32 @@ public:
Bar();
~Bar();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBar;
//-----------------------------
BIFF_SHORT pcOverlap;
BIFF_WORD pcGap;
BIFF_BOOL fTranspose;
BIFF_BOOL fStacked;
BIFF_BOOL f100;
BIFF_BOOL fHasShadow;
BIFF_BOOL fTranspose;
BIFF_BOOL fStacked;
BIFF_BOOL f100;
BIFF_BOOL fHasShadow;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(pcOverlap)
BO_ATTRIB_MARKUP_ATTRIB(pcGap)
BO_ATTRIB_MARKUP_ATTRIB(fTranspose)
BO_ATTRIB_MARKUP_ATTRIB(fStacked)
BO_ATTRIB_MARKUP_ATTRIB(f100)
BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(pcOverlap)
//BO_ATTRIB_MARKUP_ATTRIB(pcGap)
//BO_ATTRIB_MARKUP_ATTRIB(fTranspose)
//BO_ATTRIB_MARKUP_ATTRIB(fStacked)
//BO_ATTRIB_MARKUP_ATTRIB(f100)
//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS
......
......@@ -15,14 +15,17 @@ public:
Begin();
~Begin();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBegin;
//-----------------------------
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_END
};
......
......@@ -48,7 +48,7 @@ const bool BiffRecord::read(CFStreamCacheReader& reader, BaseObject* parent, con
// XML generation
//BiffStructurePtr own_tag = XMLSTUFF::createElement(getClassName(), parent);
toFrom(BinReaderProcessor(reader, parent/*own_tag*/, is_mandatory));
//toFrom(BinReaderProcessor(reader, parent/*own_tag*/, is_mandatory));
parent->add_child(this->clone());
}
......
......@@ -26,11 +26,13 @@ public:
virtual const CFRecordType::TypeId getTypeId() const = 0; // made virtual to let derived assign their own names (for example, EOF_T)
private:
static const ElementType type = typeBiffRecord;
virtual ElementType get_type() const { return type; }
//-----------------------------
virtual void readFollowingContinue(CFStreamCacheReader& reader);
//virtual void writeCreatedContinueRecords(CFStreamCacheWriter& writer);
private:
//-----------------------------
virtual const bool storeRecordAndDecideProceeding(CFRecordPtr record); // This function is overridden in BiffRecordSplit
protected:
......
......@@ -16,7 +16,7 @@ protected:
typedef std::map<CFRecordType::TypeId, std::list<CFRecordPtr> > ContinuesMap;
ContinuesMap continue_records; // All records must be removed from the list that means they are processed
private:
//-----------------------------
virtual void readFollowingContinue(CFStreamCacheReader& reader);
virtual void writeCreatedContinueRecords(CFStreamCacheWriter& writer);
......
......@@ -14,7 +14,7 @@ public:
BiffRecordSplit();
~BiffRecordSplit();
private:
//-----------------------------
virtual const bool storeRecordAndDecideProceeding(CFRecordPtr record);
protected:
......@@ -22,7 +22,7 @@ protected:
virtual const bool isEndingRecord(CFRecord& record) = 0;
virtual void useContinueRecords(CFRecord& record) = 0;
private:
//-----------------------------
CFRecordPtr stored_record;
};
......
......@@ -15,16 +15,15 @@ public:
BigName();
~BigName();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBigName;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
};
......
......@@ -15,16 +15,16 @@ public:
BkHim();
~BkHim();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBkHim;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
};
......
......@@ -22,16 +22,14 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeBlank;
const CellRef getLocation() const;
private:
//-----------------------------
CellOffsetResender resender;
Cell cell;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(resender)
BO_ATTRIB_MARKUP_COMPLEX(cell)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,22 +19,16 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBookBool;
//-----------------------------
BIFF_BOOL fNoSaveSup;
BIFF_BOOL fHasEnvelope;
BIFF_BOOL fEnvelopeVisible;
BIFF_BOOL fEnvelopeInitDone;
BIFF_BSTR grUpdateLinks;
BIFF_BOOL fHideBorderUnselLists;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fNoSaveSup)
BO_ATTRIB_MARKUP_ATTRIB(fHasEnvelope)
BO_ATTRIB_MARKUP_ATTRIB(fEnvelopeVisible)
BO_ATTRIB_MARKUP_ATTRIB(fEnvelopeInitDone)
BO_ATTRIB_MARKUP_ATTRIB(grUpdateLinks)
BO_ATTRIB_MARKUP_ATTRIB(fHideBorderUnselLists)
BO_ATTRIB_MARKUP_END
};
......
......@@ -21,7 +21,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBookExt;
//-----------------------------
BIFF_DWORD cb;
BIFF_BOOL fDontAutoRecover;
BIFF_BOOL fHidePivotList;
......@@ -35,28 +38,15 @@ private:
BookExt_Conditional11 grbit1;
BookExt_Conditional12 grbit2;
public:
BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(cb)
BO_ATTRIB_MARKUP_ATTRIB(fDontAutoRecover)
BO_ATTRIB_MARKUP_ATTRIB(fHidePivotList)
BO_ATTRIB_MARKUP_ATTRIB(fFilterPrivacy)
BO_ATTRIB_MARKUP_ATTRIB(fEmbedFactoids)
BO_ATTRIB_MARKUP_ATTRIB(mdFactoidDisplay)
BO_ATTRIB_MARKUP_ATTRIB(fSavedDuringRecovery)
BO_ATTRIB_MARKUP_ATTRIB(fCreatedViaMinimalSave)
BO_ATTRIB_MARKUP_ATTRIB(fOpenedViaDataRecovery)
BO_ATTRIB_MARKUP_ATTRIB(fOpenedViaSafeLoad)
if(cb > 20)
{
BO_ATTRIB_MARKUP_COMPLEX(grbit1)
}
if(cb > 21)
{
BO_ATTRIB_MARKUP_COMPLEX(grbit2)
}
BO_ATTRIB_MARKUP_END
//if(cb > 20)
//{
// //BO_ATTRIB_MARKUP_COMPLEX(grbit1)
//}
//if(cb > 21)
//{
// //BO_ATTRIB_MARKUP_COMPLEX(grbit2)
//}
};
......
......@@ -23,18 +23,14 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeBoolErr;
const CellRef getLocation() const;
private:
//-----------------------------
CellOffsetResender resender;
Cell cell;
Bes bes;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(resender)
BO_ATTRIB_MARKUP_COMPLEX(cell)
BO_ATTRIB_MARKUP_COMPLEX(bes)
BO_ATTRIB_MARKUP_END
};
......
......@@ -15,11 +15,14 @@ public:
BopPop();
~BopPop();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBopPop;
//-----------------------------
BIFF_BYTE pst;
Boolean<unsigned char> fAutoSplit;
BIFF_WORD split;
......@@ -29,19 +32,6 @@ private:
BIFF_SHORT pcGap;
BIFF_DOUBLE numSplitValue;
BIFF_BOOL fHasShadow;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(pst)
BO_ATTRIB_MARKUP_ATTRIB(fAutoSplit)
BO_ATTRIB_MARKUP_ATTRIB(split)
BO_ATTRIB_MARKUP_ATTRIB(iSplitPos)
BO_ATTRIB_MARKUP_ATTRIB(pcSplitPercent)
BO_ATTRIB_MARKUP_ATTRIB(pcPie2Size)
BO_ATTRIB_MARKUP_ATTRIB(pcGap)
BO_ATTRIB_MARKUP_ATTRIB(numSplitValue)
BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
BO_ATTRIB_MARKUP_END
};
} // namespace XLS
......
......@@ -7,7 +7,7 @@ namespace XLS
class BopPopCustomPiesIndices : public BiffStructure
{
BASE_OBJECT_DEFINE_CLASS_NAME(RGISeriesListSpecial)
BASE_STRUCTURE_DEFINE_CLASS_NAME(RGISeriesListSpecial)
public:
BiffStructurePtr clone();
......@@ -16,7 +16,7 @@ public:
virtual void load(CFRecord& record);
virtual void store(CFRecord& record){}
private:
//-----------------------------
std::vector<unsigned __int16> pie_indices;
};
......@@ -35,12 +35,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBopPopCustom;
//-----------------------------
BopPopCustomPiesIndices rggrbit;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(rggrbit)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBottomMargin;
//-----------------------------
BIFF_DOUBLE num;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(num)
BO_ATTRIB_MARKUP_END
};
......
......@@ -21,19 +21,13 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeBoundSheet8;
//-----------------------------
ForwardOnlyParam<unsigned int> lbPlyPos;
BIFF_BSTR hsState;
BIFF_BYTE dt;
ShortXLUnicodeString stName;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(lbPlyPos)
BO_ATTRIB_MARKUP_ATTRIB(hsState)
BO_ATTRIB_MARKUP_ATTRIB(dt)
BO_ATTRIB_MARKUP_ATTRIB(stName)
BO_ATTRIB_MARKUP_END
};
} // namespace XLS
......
......@@ -15,17 +15,16 @@ public:
BuiltInFnGroupCount();
~BuiltInFnGroupCount();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
BIFF_WORD count;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(count)
BO_ATTRIB_MARKUP_END
static const ElementType type = typeBuiltInFnGroupCount;
//-----------------------------
BIFF_WORD count;
};
} // namespace XLS
......
......@@ -21,20 +21,23 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCF;
//-----------------------------
BIFF_BYTE ct;
BIFF_BYTE cp;
DXFN rgbdxf;
CFParsedFormulaNoCCE rgce1;
CFParsedFormulaNoCCE rgce2;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(ct)
BO_ATTRIB_MARKUP_ATTRIB(cp)
BO_ATTRIB_MARKUP_COMPLEX(rgbdxf)
BO_ATTRIB_MARKUP_COMPLEX(rgce1)
BO_ATTRIB_MARKUP_COMPLEX(rgce2)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(ct)
//BO_ATTRIB_MARKUP_ATTRIB(cp)
//BO_ATTRIB_MARKUP_COMPLEX(rgbdxf)
//BO_ATTRIB_MARKUP_COMPLEX(rgce1)
//BO_ATTRIB_MARKUP_COMPLEX(rgce2)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -24,7 +24,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCF12;
//-----------------------------
FrtRefHeader frtRefHeader;
BIFF_BYTE ct;
BIFF_BYTE cp;
......@@ -39,23 +42,23 @@ private:
BiffStructurePtr rgbCT;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(frtRefHeader)
BO_ATTRIB_MARKUP_ATTRIB(ct)
BO_ATTRIB_MARKUP_ATTRIB(cp)
BO_ATTRIB_MARKUP_COMPLEX(dxf)
BO_ATTRIB_MARKUP_COMPLEX(rgce1)
BO_ATTRIB_MARKUP_COMPLEX(rgce2)
BO_ATTRIB_MARKUP_COMPLEX(fmlaActive)
BO_ATTRIB_MARKUP_ATTRIB(fStopIfTrue)
BO_ATTRIB_MARKUP_ATTRIB(ipriority)
BO_ATTRIB_MARKUP_ATTRIB(icfTemplate)
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtRefHeader)
//BO_ATTRIB_MARKUP_ATTRIB(ct)
//BO_ATTRIB_MARKUP_ATTRIB(cp)
//BO_ATTRIB_MARKUP_COMPLEX(dxf)
//BO_ATTRIB_MARKUP_COMPLEX(rgce1)
//BO_ATTRIB_MARKUP_COMPLEX(rgce2)
//BO_ATTRIB_MARKUP_COMPLEX(fmlaActive)
//BO_ATTRIB_MARKUP_ATTRIB(fStopIfTrue)
//BO_ATTRIB_MARKUP_ATTRIB(ipriority)
//BO_ATTRIB_MARKUP_ATTRIB(icfTemplate)
//rgbTemplateParms.toXML(proc.getParent(), static_cast<unsigned char>(icfTemplate));
if(rgbCT)
{
BO_ATTRIB_MARKUP_COMPLEX(*rgbCT)
}
BO_ATTRIB_MARKUP_END
//if(rgbCT)
//{
// //BO_ATTRIB_MARKUP_COMPLEX(*rgbCT)
//}
//BO_ATTRIB_MARKUP_END
};
......
......@@ -22,22 +22,24 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeCFEx;
const unsigned __int16 getID() const;
private:
//-----------------------------
FrtRefHeaderU frtRefHeaderU;
Boolean<unsigned int> fIsCF12;
BIFF_WORD nID;
CFExNonCF12 rgbContent;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
BO_ATTRIB_MARKUP_ATTRIB(fIsCF12)
BO_ATTRIB_MARKUP_ATTRIB(nID)
if(!fIsCF12)
{
BO_ATTRIB_MARKUP_COMPLEX(rgbContent)
}
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
//BO_ATTRIB_MARKUP_ATTRIB(fIsCF12)
//BO_ATTRIB_MARKUP_ATTRIB(nID)
//if(!fIsCF12)
//{
// //BO_ATTRIB_MARKUP_COMPLEX(rgbContent)
//}
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,19 +20,22 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCRN;
//-----------------------------
BIFF_BYTE colLast;
BIFF_BYTE colFirst;
BIFF_WORD row;
BiffStructurePtrVector crnOper;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(colLast)
BO_ATTRIB_MARKUP_ATTRIB(colFirst)
BO_ATTRIB_MARKUP_ATTRIB(row)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(crnOper, SerAr) // Temporarily commented to avoid compilation errors
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(colLast)
//BO_ATTRIB_MARKUP_ATTRIB(colFirst)
//BO_ATTRIB_MARKUP_ATTRIB(row)
////BO_ATTRIB_MARKUP_VECTOR_COMPLEX(crnOper, SerAr) // Temporarily commented to avoid compilation errors
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,13 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
BIFF_SHORT cIter;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(cIter)
BO_ATTRIB_MARKUP_END
static const ElementType type = typeCalcCount;
//-----------------------------
BIFF_SHORT cIter;
};
} // namespace XLS
......
......@@ -19,12 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCalcDelta;
//-----------------------------
BIFF_DOUBLE numDelta;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(numDelta)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCalcIter;
//-----------------------------
Boolean<unsigned __int16> vfIter;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(vfIter)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCalcMode;
//-----------------------------
BIFF_BSTR fAutoRecalc;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fAutoRecalc)
BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCalcPrecision;
//-----------------------------
Boolean<unsigned __int16> fFullPrec;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fFullPrec)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fFullPrec)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCalcRefMode;
//-----------------------------
BIFF_BSTR fRefA1;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fRefA1)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fRefA1)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCalcSaveRecalc;
//-----------------------------
Boolean<unsigned __int16> fSaveRecalc;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fSaveRecalc)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fSaveRecalc)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -15,20 +15,23 @@ public:
CatLab();
~CatLab();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCatLab;
//-----------------------------
BIFF_WORD wOffset;
BIFF_WORD at;
BIFF_BOOL cAutoCatLabelReal;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(wOffset)
BO_ATTRIB_MARKUP_ATTRIB(at)
BO_ATTRIB_MARKUP_ATTRIB(cAutoCatLabelReal)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(wOffset)
//BO_ATTRIB_MARKUP_ATTRIB(at)
//BO_ATTRIB_MARKUP_ATTRIB(cAutoCatLabelReal)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -15,11 +15,14 @@ public:
CatSerRange();
~CatSerRange();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCatSerRange;
//-----------------------------
BIFF_SHORT catCross;
BIFF_SHORT catLabel;
BIFF_SHORT catMark;
......@@ -27,14 +30,14 @@ private:
BIFF_BOOL fMaxCross;
BIFF_BOOL fReverse;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(catCross)
BO_ATTRIB_MARKUP_ATTRIB(catLabel)
BO_ATTRIB_MARKUP_ATTRIB(catMark)
BO_ATTRIB_MARKUP_ATTRIB(fBetween)
BO_ATTRIB_MARKUP_ATTRIB(fMaxCross)
BO_ATTRIB_MARKUP_ATTRIB(fReverse)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(catCross)
//BO_ATTRIB_MARKUP_ATTRIB(catLabel)
//BO_ATTRIB_MARKUP_ATTRIB(catMark)
//BO_ATTRIB_MARKUP_ATTRIB(fBetween)
//BO_ATTRIB_MARKUP_ATTRIB(fMaxCross)
//BO_ATTRIB_MARKUP_ATTRIB(fReverse)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,12 +20,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCellWatch;
//-----------------------------
FrtRefHeaderU frtRefHeaderU;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,19 +20,22 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeChart;
//-----------------------------
OSHARED::FixedPoint x;
OSHARED::FixedPoint y;
OSHARED::FixedPoint dx;
OSHARED::FixedPoint dy;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(x)
BO_ATTRIB_MARKUP_ATTRIB(y)
BO_ATTRIB_MARKUP_ATTRIB(dx)
BO_ATTRIB_MARKUP_ATTRIB(dy)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(x)
//BO_ATTRIB_MARKUP_ATTRIB(y)
//BO_ATTRIB_MARKUP_ATTRIB(dx)
//BO_ATTRIB_MARKUP_ATTRIB(dy)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,14 +19,17 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeChart3DBarShape;
//-----------------------------
BIFF_BYTE riser;
BIFF_BYTE taper;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(riser)
BO_ATTRIB_MARKUP_ATTRIB(taper)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(riser)
//BO_ATTRIB_MARKUP_ATTRIB(taper)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -15,39 +15,42 @@ public:
Chart3d();
~Chart3d();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeChart3d;
//-----------------------------
BIFF_SHORT anRot;
BIFF_SHORT anElev;
BIFF_SHORT pcDist;
BIFF_DWORD pcHeight;
BIFF_SHORT pcDepth;
BIFF_WORD pcGap;
BIFF_BOOL fPerspective;
BIFF_BOOL fCluster;
BIFF_BOOL f3DScaling;
BIFF_BOOL fNotPieChart;
BIFF_BOOL fWalls2D;
BIFF_BOOL fPerspective;
BIFF_BOOL fCluster;
BIFF_BOOL f3DScaling;
BIFF_BOOL fNotPieChart;
BIFF_BOOL fWalls2D;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(anRot)
BO_ATTRIB_MARKUP_ATTRIB(anElev)
BO_ATTRIB_MARKUP_ATTRIB(pcDist)
BO_ATTRIB_MARKUP_ATTRIB(pcHeight)
BO_ATTRIB_MARKUP_ATTRIB(pcDepth)
BO_ATTRIB_MARKUP_ATTRIB(pcGap)
BO_ATTRIB_MARKUP_ATTRIB(fPerspective)
BO_ATTRIB_MARKUP_ATTRIB(fCluster)
BO_ATTRIB_MARKUP_ATTRIB(f3DScaling)
BO_ATTRIB_MARKUP_ATTRIB(fNotPieChart)
BO_ATTRIB_MARKUP_ATTRIB(fWalls2D)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(anRot)
//BO_ATTRIB_MARKUP_ATTRIB(anElev)
//BO_ATTRIB_MARKUP_ATTRIB(pcDist)
//BO_ATTRIB_MARKUP_ATTRIB(pcHeight)
//BO_ATTRIB_MARKUP_ATTRIB(pcDepth)
//BO_ATTRIB_MARKUP_ATTRIB(pcGap)
//BO_ATTRIB_MARKUP_ATTRIB(fPerspective)
//BO_ATTRIB_MARKUP_ATTRIB(fCluster)
//BO_ATTRIB_MARKUP_ATTRIB(f3DScaling)
//BO_ATTRIB_MARKUP_ATTRIB(fNotPieChart)
//BO_ATTRIB_MARKUP_ATTRIB(fWalls2D)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,14 +19,17 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeChartFormat;
//-----------------------------
BIFF_BOOL fVaried;
BIFF_WORD icrt;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fVaried)
BO_ATTRIB_MARKUP_ATTRIB(icrt)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fVaried)
//BO_ATTRIB_MARKUP_ATTRIB(icrt)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,14 +19,17 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeChartFrtInfo;
//-----------------------------
BIFF_BYTE verOriginator;
BIFF_BYTE verWriter;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(verOriginator)
BO_ATTRIB_MARKUP_ATTRIB(verWriter)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(verOriginator)
//BO_ATTRIB_MARKUP_ATTRIB(verWriter)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -13,6 +13,9 @@ class ClrtClient: public Palette // Absolutely the same as 'Palette'
BASE_OBJECT_DEFINE_CLASS_NAME(ClrtClient)
public:
ClrtClient() : Palette(3) {};
static const ElementType type = typeClrtClient;
};
} // namespace XLS
......
......@@ -20,12 +20,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCodeName;
//-----------------------------
XLUnicodeString codeName;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(codeName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(codeName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,12 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
//-----------------------------
BIFF_WORD cv;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(cv)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(cv)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,7 +19,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeColInfo;
//-----------------------------
Col256U colFirst;
Col256U colLast;
BIFF_WORD coldx;
......@@ -34,19 +37,19 @@ private:
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(colFirst)
BO_ATTRIB_MARKUP_ATTRIB(colLast)
BO_ATTRIB_MARKUP_ATTRIB(coldx)
BO_ATTRIB_MARKUP_ATTRIB(ixfe)
BO_ATTRIB_MARKUP_ATTRIB(fHidden)
BO_ATTRIB_MARKUP_ATTRIB(fUserSet)
BO_ATTRIB_MARKUP_ATTRIB(fBestFit)
BO_ATTRIB_MARKUP_ATTRIB(fPhonetic)
BO_ATTRIB_MARKUP_ATTRIB(iOutLevel)
BO_ATTRIB_MARKUP_ATTRIB(fCollapsed)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(colFirst)
//BO_ATTRIB_MARKUP_ATTRIB(colLast)
//BO_ATTRIB_MARKUP_ATTRIB(coldx)
//BO_ATTRIB_MARKUP_ATTRIB(ixfe)
//BO_ATTRIB_MARKUP_ATTRIB(fHidden)
//BO_ATTRIB_MARKUP_ATTRIB(fUserSet)
//BO_ATTRIB_MARKUP_ATTRIB(fBestFit)
//BO_ATTRIB_MARKUP_ATTRIB(fPhonetic)
//BO_ATTRIB_MARKUP_ATTRIB(iOutLevel)
//BO_ATTRIB_MARKUP_ATTRIB(fCollapsed)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCompat12;
//-----------------------------
Boolean<unsigned int> fNoCompatChk;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fNoCompatChk)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fNoCompatChk)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCompressPictures;
//-----------------------------
Boolean<unsigned int> fAutoCompressPictures;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fAutoCompressPictures)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fAutoCompressPictures)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,22 +20,25 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeCondFmt;
const CellRef getLocation() const;
private:
//-----------------------------
BIFF_WORD ccf;
BIFF_BOOL fToughRecalc;
BIFF_WORD nID;
SqRefU sqref;
BIFF_BSTR refBound;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(ccf)
BO_ATTRIB_MARKUP_ATTRIB(fToughRecalc)
BO_ATTRIB_MARKUP_ATTRIB(nID)
BO_ATTRIB_MARKUP_ATTRIB(refBound)
BO_ATTRIB_MARKUP_COMPLEX(sqref)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(ccf)
//BO_ATTRIB_MARKUP_ATTRIB(fToughRecalc)
//BO_ATTRIB_MARKUP_ATTRIB(nID)
//BO_ATTRIB_MARKUP_ATTRIB(refBound)
//BO_ATTRIB_MARKUP_COMPLEX(sqref)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -22,15 +22,18 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeCondFmt12;
const CellRef getLocation() const;
private:
//-----------------------------
FrtRefHeaderU frtRefHeaderU;
CondFmtStructure mainCF;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
BO_ATTRIB_MARKUP_COMPLEX(mainCF)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
//BO_ATTRIB_MARKUP_COMPLEX(mainCF)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeContinue;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeContinueBigName;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeContinueFrt;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,9 +20,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeContinueFrt11;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,9 +20,11 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeContinueFrt12;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_END
};
typedef boost::shared_ptr<ContinueFrt12> ContinueFrt12Ptr;
......
......@@ -15,18 +15,21 @@ public:
Country();
~Country();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCountry;
//-----------------------------
BIFF_WORD iCountryDef;
BIFF_WORD iCountryWinIni;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(iCountryDef)
BO_ATTRIB_MARKUP_ATTRIB(iCountryWinIni)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(iCountryDef)
//BO_ATTRIB_MARKUP_ATTRIB(iCountryWinIni)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCrErr;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,7 +19,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCrtLayout12;
//-----------------------------
BIFF_DWORD dwCheckSum;
BIFF_BYTE autolayouttype;
CrtLayout12Mode wXMode;
......@@ -32,18 +35,18 @@ private:
BIFF_DOUBLE dy;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(dwCheckSum)
BO_ATTRIB_MARKUP_ATTRIB(autolayouttype)
BO_ATTRIB_MARKUP_ATTRIB(wXMode)
BO_ATTRIB_MARKUP_ATTRIB(wYMode)
BO_ATTRIB_MARKUP_ATTRIB(wWidthMode)
BO_ATTRIB_MARKUP_ATTRIB(wHeightMode)
BO_ATTRIB_MARKUP_ATTRIB(x)
BO_ATTRIB_MARKUP_ATTRIB(y)
BO_ATTRIB_MARKUP_ATTRIB(dx)
BO_ATTRIB_MARKUP_ATTRIB(dy)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(dwCheckSum)
//BO_ATTRIB_MARKUP_ATTRIB(autolayouttype)
//BO_ATTRIB_MARKUP_ATTRIB(wXMode)
//BO_ATTRIB_MARKUP_ATTRIB(wYMode)
//BO_ATTRIB_MARKUP_ATTRIB(wWidthMode)
//BO_ATTRIB_MARKUP_ATTRIB(wHeightMode)
//BO_ATTRIB_MARKUP_ATTRIB(x)
//BO_ATTRIB_MARKUP_ATTRIB(y)
//BO_ATTRIB_MARKUP_ATTRIB(dx)
//BO_ATTRIB_MARKUP_ATTRIB(dy)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCrtLayout12A;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCrtLine;
//-----------------------------
BIFF_WORD id;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(id)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(id)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,9 +19,12 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeCrtLink;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCrtMlFrt;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,16 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeCrtMlFrtContinue;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -24,17 +24,18 @@ public:
static void catchUnusedCellOffset(CFStream& stream, const unsigned int data_place, const unsigned int data);
static void offsetFromRowMaker(CFStream& stream, const unsigned int data_place, const unsigned int data);
private:
static const ElementType type = typeDBCell;
//-----------------------------
ForwardOnlyParam<unsigned int> dbRtrw;
BiffStructurePtrVector rgdb;
BackwardOnlyParam<unsigned int> num_pointers;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(dbRtrw)
BO_ATTRIB_MARKUP_ATTRIB(num_pointers)
BO_ATTRIB_MARKUP_VECTOR_COMPLEX(rgdb, FileOffset)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(dbRtrw)
//BO_ATTRIB_MARKUP_ATTRIB(num_pointers)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(rgdb, FileOffset)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDBQueryExt;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,7 +19,9 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDCon;
//-----------------------------
// BIFF_WORD userName;
unsigned __int16 iiftab;
unsigned __int16 fLeftCat;
......@@ -28,9 +30,9 @@ private:
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDConBin;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDConName;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDConRef;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDConn;
//-----------------------------
// BIFF_WORD userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -15,16 +15,19 @@ public:
DSF();
~DSF();
BaseObjectPtr clone();
BaseObjectPtr clone();
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDSF;
//-----------------------------
// XLUnicodeString userName;
public:
BO_ATTRIB_MARKUP_BEGIN
// BO_ATTRIB_MARKUP_ATTRIB(userName)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,7 +19,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDVal;
//-----------------------------
BIFF_BOOL fWnClosed;
BIFF_DWORD xLeft;
BIFF_DWORD yTop;
......@@ -27,13 +30,13 @@ private:
BIFF_DWORD idvMac;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fWnClosed)
BO_ATTRIB_MARKUP_ATTRIB(xLeft)
BO_ATTRIB_MARKUP_ATTRIB(yTop)
BO_ATTRIB_MARKUP_ATTRIB(idObj)
BO_ATTRIB_MARKUP_ATTRIB(idvMac)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fWnClosed)
//BO_ATTRIB_MARKUP_ATTRIB(xLeft)
//BO_ATTRIB_MARKUP_ATTRIB(yTop)
//BO_ATTRIB_MARKUP_ATTRIB(idObj)
//BO_ATTRIB_MARKUP_ATTRIB(idvMac)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -21,16 +21,19 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDXF;
//-----------------------------
FrtRefHeaderU frtRefHeaderU;
BIFF_BOOL fNewBorder;
XFProps xfprops;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
BO_ATTRIB_MARKUP_ATTRIB(fNewBorder)
BO_ATTRIB_MARKUP_COMPLEX(xfprops)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
//BO_ATTRIB_MARKUP_ATTRIB(fNewBorder)
//BO_ATTRIB_MARKUP_COMPLEX(xfprops)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,19 +20,20 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDat;
//-----------------------------
BIFF_BOOL fHasBordHorz;
BIFF_BOOL fHasBordVert;
BIFF_BOOL fHasBordOutline;
BIFF_BOOL fShowSeriesKey;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fHasBordHorz)
BO_ATTRIB_MARKUP_ATTRIB(fHasBordVert)
BO_ATTRIB_MARKUP_ATTRIB(fHasBordOutline)
BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesKey)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fHasBordHorz)
//BO_ATTRIB_MARKUP_ATTRIB(fHasBordVert)
//BO_ATTRIB_MARKUP_ATTRIB(fHasBordOutline)
//BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesKey)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,18 +19,21 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDataFormat;
//-----------------------------
BIFF_WORD xi;
BIFF_WORD yi;
BIFF_WORD iss;
BIFF_BOOL fUnknown;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(xi)
BO_ATTRIB_MARKUP_ATTRIB(yi)
BO_ATTRIB_MARKUP_ATTRIB(iss)
BO_ATTRIB_MARKUP_ATTRIB(fUnknown)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(xi)
//BO_ATTRIB_MARKUP_ATTRIB(yi)
//BO_ATTRIB_MARKUP_ATTRIB(iss)
//BO_ATTRIB_MARKUP_ATTRIB(fUnknown)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,9 +20,12 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
static const ElementType type = typeDataLabExt;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_END
};
......
......@@ -20,7 +20,10 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDataLabExtContents;
//-----------------------------
BIFF_BOOL fSerName;
BIFF_BOOL fCatName;
......@@ -31,15 +34,15 @@ private:
XLUnicodeStringMin2 rgchSep;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(fSerName)
BO_ATTRIB_MARKUP_ATTRIB(fCatName)
BO_ATTRIB_MARKUP_ATTRIB(fValue)
BO_ATTRIB_MARKUP_ATTRIB(fPercent)
BO_ATTRIB_MARKUP_ATTRIB(fBubSizes)
BO_ATTRIB_MARKUP_ATTRIB(rgchSep)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fSerName)
//BO_ATTRIB_MARKUP_ATTRIB(fCatName)
//BO_ATTRIB_MARKUP_ATTRIB(fValue)
//BO_ATTRIB_MARKUP_ATTRIB(fPercent)
//BO_ATTRIB_MARKUP_ATTRIB(fBubSizes)
//BO_ATTRIB_MARKUP_ATTRIB(rgchSep)
//BO_ATTRIB_MARKUP_END
};
......
......@@ -19,12 +19,15 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
private:
static const ElementType type = typeDate1904;
//-----------------------------
Boolean<unsigned __int16> f1904DateSystem;
public:
BO_ATTRIB_MARKUP_BEGIN
BO_ATTRIB_MARKUP_ATTRIB(f1904DateSystem)
BO_ATTRIB_MARKUP_END
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(f1904DateSystem)
//BO_ATTRIB_MARKUP_END
};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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