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

XlsFile2 linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64116 954022d7-b5bf-4e40-9824-e11837661b57
parent 4f111fba

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -28,68 +28,27 @@ INCLUDEPATH += \ ...@@ -28,68 +28,27 @@ INCLUDEPATH += \
SOURCES += \ SOURCES += \
XlsFileConverter.cpp XlsFileConverter.cpp
CONFIG(debug, debug|release){
message(Debug)
linux-g++{ linux-g++{
message(64 bit) message(64 bit)
unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Debug/ -lASCOfficeUtilsLib unix:!macx: LIBS += -L$$PWD/../../SDK/lib/linux_64/ -lXlsFormatLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Debug/libASCOfficeUtilsLib.a unix:!macx: PRE_TARGETDEPS += $$PWD/../../SDK/lib/linux_64/libXlsFormatLib.a
unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Debug/ -lDocxFormatLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Debug/libDocxFormatLib.a
unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Debug/ -lgraphics unix:!macx: LIBS += -L$$PWD/../../SDK/lib/linux_64/ -lgraphics
unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Debug/libgraphics.a unix:!macx: PRE_TARGETDEPS += $$PWD/../../SDK/lib/linux_64/libgraphics.a
} }
else{ else{
message(32 bit) message(32 bit)
unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Debug/ -lASCOfficeUtilsLib unix:!macx: LIBS += -L$$PWD/../../SDK/lib/linux_32/ -lXlsFormatLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Debug/libASCOfficeUtilsLib.a unix:!macx: PRE_TARGETDEPS += $$PWD/../../SDK/lib/linux_32/libXlsFormatLib.a
unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug/ -lDocxFormatLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug/libDocxFormatLib.a
unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Debug/ -lgraphics
unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Debug/libgraphics.a
}
}
CONFIG(release, debug|release){
message(Release)
linux-g++{
message(64 bit)
unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Release/ -lASCOfficeUtilsLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Release/libASCOfficeUtilsLib.a
unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Release/ -lDocxFormatLib unix:!macx: LIBS += -L$$PWD/../../SDK/lib/linux_32/ -lgraphics
unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Release/libDocxFormatLib.a unix:!macx: PRE_TARGETDEPS += $$PWD/../../SDK/lib/linux_32/libgraphics.a
unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Release/ -lgraphics
unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Release/libgraphics.a
} }
else{
message(32 bit)
unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Release/ -lASCOfficeUtilsLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Release/libASCOfficeUtilsLib.a
unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Release/ -lDocxFormatLib
unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Release/libDocxFormatLib.a
unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Release/ -lgraphics
unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Release/libgraphics.a
}
}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#endif #endif
namespace XLS namespace XLS
{; {
template<class T> template<class T>
CFRecord& operator<<(CFRecord& record, std::vector<T>& vec) CFRecord& operator<<(CFRecord& record, std::vector<T>& vec)
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
#include "BinSmartPointers.h" #include "BinSmartPointers.h"
#include "../Logic/GlobalWorkbookInfo.h" #include "../Logic/GlobalWorkbookInfo.h"
#include "../../Common/common.h" #include <common.h>
#include "../Auxiliary/HelpFunc.h" #include <Auxiliary/HelpFunc.h>
namespace XLS namespace XLS
{; {
// Binary representation of a record in BIFF8 // Binary representation of a record in BIFF8
class CFRecord class CFRecord
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
namespace XLS namespace XLS
{; {
struct CFRecordTypeValue struct CFRecordTypeValue
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <map> #include <map>
namespace XLS namespace XLS
{; {
class CFRecordType class CFRecordType
{ {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <sstream> #include <sstream>
namespace XLS namespace XLS
{; {
CFStream::CFStream(POLE::Stream* stream) CFStream::CFStream(POLE::Stream* stream)
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "BinSmartPointers.h" #include "BinSmartPointers.h"
namespace XLS namespace XLS
{; {
// Binary representation of a stream in BIFF8 // Binary representation of a stream in BIFF8
class CFStream class CFStream
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
#include "CFStreamCacheReader.h" #include "CFStreamCacheReader.h"
#include "CFRecord.h" #include "CFRecord.h"
#include "CFStream.h" #include "CFStream.h"
#include "../Logic/Biff_records/BOF.h" #include <Logic/Biff_records/BOF.h>
namespace XLS namespace XLS
{; {
CFStreamCacheReader::CFStreamCacheReader(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info) CFStreamCacheReader::CFStreamCacheReader(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info)
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
#include "CFRecordType.h" #include "CFRecordType.h"
#include "BinSmartPointers.h" #include "BinSmartPointers.h"
#include "../Logic/GlobalWorkbookInfo.h" #include <Logic/GlobalWorkbookInfo.h>
#include "../Logic/Biff_structures/ODRAW/OfficeArtRecordHeader.h" #include <Logic/Biff_structures/ODRAW/OfficeArtRecordHeader.h>
namespace XLS namespace XLS
{; {
// The only purpose of the reader is to avoid seeking back through IStream when, for example, // The only purpose of the reader is to avoid seeking back through IStream when, for example,
// we have read a record from a binary stream to the CFRecord, but the record of this type is // we have read a record from a binary stream to the CFRecord, but the record of this type is
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace XLS namespace XLS
{; {
CFStreamCacheWriter::CFStreamCacheWriter(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info) CFStreamCacheWriter::CFStreamCacheWriter(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info)
......
#pragma once #pragma once
#include "BinSmartPointers.h" #include "BinSmartPointers.h"
#include "../Logic/GlobalWorkbookInfo.h" #include <Logic/GlobalWorkbookInfo.h>
namespace XLS namespace XLS
{; {
// The purpose of the writer is to avoid seeking back through IStream when, for example, // The purpose of the writer is to avoid seeking back through IStream when, for example,
// we have write an offset of a record that would appear in processing much later. // we have write an offset of a record that would appear in processing much later.
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <sstream> #include <sstream>
namespace XLS namespace XLS
{; {
CompoundFile::~CompoundFile() CompoundFile::~CompoundFile()
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <map> #include <map>
namespace XLS namespace XLS
{; {
class CompoundFile class CompoundFile
......
#include "BiffDecoder_RCF.h" #include "BiffDecoder_RCF.h"
namespace CRYPT namespace CRYPT
{; {
BiffDecoderBase::BiffDecoderBase() : mbValid(false) BiffDecoderBase::BiffDecoderBase() : mbValid(false)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <vector> #include <vector>
namespace CRYPT namespace CRYPT
{; {
const long BIFF_RCF_BLOCKSIZE = 1024; const long BIFF_RCF_BLOCKSIZE = 1024;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BinaryCodec_RCF.h" #include "BinaryCodec_RCF.h"
namespace CRYPT namespace CRYPT
{; {
BinaryCodec_RCF::BinaryCodec_RCF() BinaryCodec_RCF::BinaryCodec_RCF()
{ {
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
#include "rtl/cipher.h" #include "rtl/cipher.h"
#include "rtl/digest.h" #include "rtl/digest.h"
#include <string.h>
namespace CRYPT namespace CRYPT
{; {
/** Encodes and decodes data from protected MSO 97+ documents. /** Encodes and decodes data from protected MSO 97+ documents.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
namespace CRYPT namespace CRYPT
{; {
class Crypt class Crypt
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
//#include <Logic/Biff_structures/RC4CryptoAPIEncryptionHeader.h> //#include <Logic/Biff_structures/RC4CryptoAPIEncryptionHeader.h>
namespace CRYPT namespace CRYPT
{; {
Decryptor::Decryptor(const CRYPTO::RC4EncryptionHeader& header) Decryptor::Decryptor(const CRYPTO::RC4EncryptionHeader& header)
: crypt(new RC4Crypt(header)), : crypt(new RC4Crypt(header)),
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
#include "Crypt.h" #include "Crypt.h"
namespace CRYPTO namespace CRYPTO
{; {
class RC4EncryptionHeader; class RC4EncryptionHeader;
} // namespace CRYPTO } // namespace CRYPTO
namespace CRYPT namespace CRYPT
{; {
class Decryptor class Decryptor
{ {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
namespace CRYPT namespace CRYPT
{; {
RC4Crypt::RC4Crypt(const CRYPTO::RC4EncryptionHeader& header) RC4Crypt::RC4Crypt(const CRYPTO::RC4EncryptionHeader& header)
{ {
...@@ -51,13 +51,13 @@ void RC4Crypt::Decrypt(char* data, const size_t size, const unsigned long stream ...@@ -51,13 +51,13 @@ void RC4Crypt::Decrypt(char* data, const size_t size, const unsigned long stream
if(size <= 256) if(size <= 256)
{ {
mxDecoder->decode( quick_buf, reinterpret_cast<unsigned char*>(data), stream_pos, size ); mxDecoder->decode( quick_buf, reinterpret_cast<unsigned char*>(data), stream_pos, size );
memcpy_s(data, size, quick_buf, size); memcpy(data, quick_buf, size);
} }
else else
{ {
boost::scoped_array<unsigned char> out_data(new unsigned char[size]); boost::scoped_array<unsigned char> out_data(new unsigned char[size]);
mxDecoder->decode( out_data.get(), reinterpret_cast<unsigned char*>(data), stream_pos, size ); mxDecoder->decode( out_data.get(), reinterpret_cast<unsigned char*>(data), stream_pos, size );
memcpy_s(data, size, out_data.get(), size); memcpy(data, out_data.get(), size);
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "BiffDecoder_RCF.h" #include "BiffDecoder_RCF.h"
namespace CRYPT namespace CRYPT
{; {
class RC4Crypt : public Crypt class RC4Crypt : public Crypt
{ {
......
#pragma once #pragma once
#include <stddef.h>
class CipherARCFOUR class CipherARCFOUR
{ {
......
#include "digest.h" #include "digest.h"
#include <memory> #include <memory>
#include <string.h>
#define RTL_DIGEST_ROTL(a,n) (((a) << (n)) | ((a) >> (32 - (n)))) #define RTL_DIGEST_ROTL(a,n) (((a) << (n)) | ((a) >> (32 - (n))))
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <list> #include <list>
#include <sstream> #include <sstream>
#include "../Logging/Log.h" #include "Logging/Log.h"
#include "XlsElementsType.h" // #include "XlsElementsType.h" //
namespace XLS namespace XLS
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AlRuns.h" #include "AlRuns.h"
namespace XLS namespace XLS
{; {
AlRuns::AlRuns() AlRuns::AlRuns()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/FormatRun.h" #include <Logic/Biff_structures/FormatRun.h>
namespace XLS namespace XLS
{; {
// Logical representation of AlRuns record in BIFF8 // Logical representation of AlRuns record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Area.h" #include "Area.h"
namespace XLS namespace XLS
{; {
Area::Area() Area::Area()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of Area record in BIFF8 // Logical representation of Area record in BIFF8
...@@ -15,16 +15,16 @@ public: ...@@ -15,16 +15,16 @@ public:
Area(); Area();
~Area(); ~Area();
BaseObjectPtr clone(); BaseObjectPtr clone();
void writeFields(CFRecord& record); void writeFields(CFRecord& record);
void readFields(CFRecord& record); void readFields(CFRecord& record);
static const ElementType type = typeArea; static const ElementType type = typeArea;
BIFF_BOOL fStacked; BIFF_BOOL fStacked;
BIFF_BOOL f100; BIFF_BOOL f100;
BIFF_BOOL fHasShadow; BIFF_BOOL fHasShadow;
}; };
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AreaFormat.h" #include "AreaFormat.h"
namespace XLS namespace XLS
{; {
AreaFormat::AreaFormat() AreaFormat::AreaFormat()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/LongRGB.h"" #include <Logic/Biff_structures/LongRGB.h>
namespace XLS namespace XLS
{; {
// Logical representation of AreaFormat record in BIFF8 // Logical representation of AreaFormat record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Array.h" #include "Array.h"
namespace XLS namespace XLS
{; {
Array::Array(const CellRef& cell_base_ref_init) Array::Array(const CellRef& cell_base_ref_init)
: formula(false, cell_base_ref_init) : formula(false, cell_base_ref_init)
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../Biff_structures/CellRangeRef.h" #include <Logic/Biff_structures/CellRangeRef.h>
#include "../Biff_structures/ArrayParsedFormula.h" #include <Logic/Biff_structures/ArrayParsedFormula.h>
namespace XLS namespace XLS
{; {
// Logical representation of Array record in BIFF8 // Logical representation of Array record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AttachedLabel.h" #include "AttachedLabel.h"
namespace XLS namespace XLS
{; {
AttachedLabel::AttachedLabel() AttachedLabel::AttachedLabel()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of AttachedLabel record in BIFF8 // Logical representation of AttachedLabel record in BIFF8
...@@ -15,28 +15,28 @@ public: ...@@ -15,28 +15,28 @@ public:
AttachedLabel(); AttachedLabel();
~AttachedLabel(); ~AttachedLabel();
BaseObjectPtr clone(); BaseObjectPtr clone();
void writeFields(CFRecord& record); void writeFields(CFRecord& record);
void readFields(CFRecord& record); void readFields(CFRecord& record);
static const ElementType type = typeAttachedLabel; static const ElementType type = typeAttachedLabel;
//----------------------------- //-----------------------------
BIFF_BOOL fShowValue; BIFF_BOOL fShowValue;
BIFF_BOOL fShowPercent; BIFF_BOOL fShowPercent;
BIFF_BOOL fShowLabelAndPerc; BIFF_BOOL fShowLabelAndPerc;
BIFF_BOOL fShowLabel; BIFF_BOOL fShowLabel;
BIFF_BOOL fShowBubbleSizes; BIFF_BOOL fShowBubbleSizes;
BIFF_BOOL fShowSeriesName; BIFF_BOOL fShowSeriesName;
public: public:
//BO_ATTRIB_MARKUP_BEGIN //BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fShowValue) //BO_ATTRIB_MARKUP_ATTRIB(fShowValue)
//BO_ATTRIB_MARKUP_ATTRIB(fShowPercent) //BO_ATTRIB_MARKUP_ATTRIB(fShowPercent)
//BO_ATTRIB_MARKUP_ATTRIB(fShowLabelAndPerc) //BO_ATTRIB_MARKUP_ATTRIB(fShowLabelAndPerc)
//BO_ATTRIB_MARKUP_ATTRIB(fShowLabel) //BO_ATTRIB_MARKUP_ATTRIB(fShowLabel)
//BO_ATTRIB_MARKUP_ATTRIB(fShowBubbleSizes) //BO_ATTRIB_MARKUP_ATTRIB(fShowBubbleSizes)
//BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesName) //BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesName)
//BO_ATTRIB_MARKUP_END //BO_ATTRIB_MARKUP_END
}; };
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AutoFilter.h" #include "AutoFilter.h"
namespace XLS namespace XLS
{; {
AutoFilter::AutoFilter() AutoFilter::AutoFilter()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../Biff_structures/AFDOper.h" #include <Logic/Biff_structures/AFDOper.h>
namespace XLS namespace XLS
{; {
// Logical representation of AutoFilter record in BIFF8 // Logical representation of AutoFilter record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AutoFilter12.h" #include "AutoFilter12.h"
namespace XLS namespace XLS
{; {
AutoFilter12::AutoFilter12() AutoFilter12::AutoFilter12()
{ {
......
#pragma once #pragma once
#include "BiffRecordContinued.h" #include "BiffRecordContinued.h"
#include "../Biff_structures/FrtRefHeader.h" #include <Logic/Biff_structures/FrtRefHeader.h>
#include "../Biff_structures/BiffString.h" #include <Logic/Biff_structures/BiffString.h>
#include "../Biff_structures/FrtRefHeader.h" #include <Logic/Biff_structures/FrtRefHeader.h>
#include "../Biff_structures/AFDOper.h" #include <Logic/Biff_structures/AFDOper.h>
#include "../Biff_structures/AF12Criteria.h" #include <Logic/Biff_structures/AF12Criteria.h>
namespace XLS namespace XLS
{; {
// Logical representation of AutoFilter12 record in BIFF8 // Logical representation of AutoFilter12 record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AutoFilterInfo.h" #include "AutoFilterInfo.h"
namespace XLS namespace XLS
{; {
AutoFilterInfo::AutoFilterInfo() AutoFilterInfo::AutoFilterInfo()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of AutoFilterInfo record in BIFF8 // Logical representation of AutoFilterInfo record in BIFF8
...@@ -17,8 +17,8 @@ class AutoFilterInfo: public BiffRecord ...@@ -17,8 +17,8 @@ class AutoFilterInfo: public BiffRecord
AutoFilterInfo(); AutoFilterInfo();
~AutoFilterInfo(); ~AutoFilterInfo();
BaseObjectPtr clone(); BaseObjectPtr clone();
void writeFields(CFRecord& record); void writeFields(CFRecord& record);
void readFields(CFRecord& record); void readFields(CFRecord& record);
//----------------------------- //-----------------------------
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AxcExt.h" #include "AxcExt.h"
namespace XLS namespace XLS
{; {
AxcExt::AxcExt() AxcExt::AxcExt()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of AxcExt record in BIFF8 // Logical representation of AxcExt record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AxesUsed.h" #include "AxesUsed.h"
namespace XLS namespace XLS
{; {
AxesUsed::AxesUsed() AxesUsed::AxesUsed()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of AxesUsed record in BIFF8 // Logical representation of AxesUsed record in BIFF8
...@@ -15,8 +15,8 @@ public: ...@@ -15,8 +15,8 @@ public:
AxesUsed(); AxesUsed();
~AxesUsed(); ~AxesUsed();
BaseObjectPtr clone(); BaseObjectPtr clone();
void writeFields(CFRecord& record); void writeFields(CFRecord& record);
void readFields(CFRecord& record); void readFields(CFRecord& record);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Axis.h" #include "Axis.h"
namespace XLS namespace XLS
{; {
Axis::Axis() Axis::Axis()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of Axis record in BIFF8 // Logical representation of Axis record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AxisLine.h" #include "AxisLine.h"
namespace XLS namespace XLS
{; {
AxisLine::AxisLine() AxisLine::AxisLine()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of AxisLine record in BIFF8 // Logical representation of AxisLine record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "AxisParent.h" #include "AxisParent.h"
namespace XLS namespace XLS
{; {
AxisParent::AxisParent() AxisParent::AxisParent()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of AxisParent record in BIFF8 // Logical representation of AxisParent record in BIFF8
......
#include "BOF.h" #include "BOF.h"
#include "../../Binary/CFStream.h" #include <Binary/CFStream.h>
namespace XLS namespace XLS
{; {
BOF::BOF() BOF::BOF()
{ {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
//#include <Logic/Biff_structures/FilePointer.h> //#include <Logic/Biff_structures/FilePointer.h>
namespace XLS namespace XLS
{; {
class CFStreamCacheReader; class CFStreamCacheReader;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BRAI.h" #include "BRAI.h"
namespace XLS namespace XLS
{; {
BRAI::BRAI() BRAI::BRAI()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/ChartParsedFormula.h" #include <Logic/Biff_structures/ChartParsedFormula.h>
namespace XLS namespace XLS
{; {
// Logical representation of BRAI record in BIFF8 // Logical representation of BRAI record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Backup.h" #include "Backup.h"
namespace XLS namespace XLS
{; {
Backup::Backup() Backup::Backup()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of Backup record in BIFF8 // Logical representation of Backup record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Bar.h" #include "Bar.h"
namespace XLS namespace XLS
{; {
Bar::Bar() Bar::Bar()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of Bar record in BIFF8 // Logical representation of Bar record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Begin.h" #include "Begin.h"
namespace XLS namespace XLS
{; {
Begin::Begin() Begin::Begin()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of Begin record in BIFF8 // Logical representation of Begin record in BIFF8
......
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Binary/CFStream.h" #include <Binary/CFStream.h>
#include "../../Binary/CFStreamCacheReader.h" #include "Binary/CFStreamCacheReader.h"
#include "../../Binary/CFStreamCacheWriter.h" #include "Binary/CFStreamCacheWriter.h"
namespace XLS namespace XLS
{; {
BiffRecord::BiffRecord() BiffRecord::BiffRecord()
{ {
......
#pragma once #pragma once
#include "../BaseObject.h" #include <Logic/BaseObject.h>
#include "../Biff_structures/BitMarkedStructs.h" #include <Logic/Biff_structures/BitMarkedStructs.h>
#include "../BinProcessor.h" #include <Logic/BinProcessor.h>
namespace XLS namespace XLS
{; {
class CFStream; class CFStream;
......
#include "BiffRecordContinued.h" #include "BiffRecordContinued.h"
#include "../../Binary/CFStreamCacheReader.h" #include "Binary/CFStreamCacheReader.h"
#include "../../Binary/CFStreamCacheWriter.h" #include "Binary/CFStreamCacheWriter.h"
namespace XLS namespace XLS
{; {
BiffRecordContinued::BiffRecordContinued() BiffRecordContinued::BiffRecordContinued()
{ {
......
#pragma once #pragma once
#include "../Biff_records/BiffRecord.h" #include <Logic/Biff_records/BiffRecord.h>
namespace XLS namespace XLS
{; {
// Logical representation of a record in BIFF8 that is followed by a number of Continue records // Logical representation of a record in BIFF8 that is followed by a number of Continue records
class BiffRecordContinued: public BiffRecord class BiffRecordContinued: public BiffRecord
......
#include "BiffRecordSplit.h" #include "BiffRecordSplit.h"
#include "../../Binary/CFStreamCacheReader.h" #include "Binary/CFStreamCacheReader.h"
#include "../../Binary/CFStreamCacheWriter.h" #include "Binary/CFStreamCacheWriter.h"
namespace XLS namespace XLS
{; {
BiffRecordSplit::BiffRecordSplit() BiffRecordSplit::BiffRecordSplit()
{ {
......
#pragma once #pragma once
#include "../../Logic/Biff_records/BiffRecordContinued.h" #include <Logic/Biff_records/BiffRecordContinued.h>
namespace XLS namespace XLS
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BigName.h" #include "BigName.h"
namespace XLS namespace XLS
{; {
BigName::BigName() BigName::BigName()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecordContinued.h" #include "BiffRecordContinued.h"
namespace XLS namespace XLS
{; {
// Logical representation of BigName record in BIFF8 // Logical representation of BigName record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BkHim.h" #include "BkHim.h"
namespace XLS namespace XLS
{; {
BkHim::BkHim() BkHim::BkHim()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecordContinued.h" #include "BiffRecordContinued.h"
namespace XLS namespace XLS
{; {
// Logical representation of BkHim record in BIFF8 // Logical representation of BkHim record in BIFF8
......
#include "Blank.h" #include "Blank.h"
#include "../Common/simple_xml_writer.h" #include <simple_xml_writer.h>
namespace XLS namespace XLS
{; {
extern int cellStyleXfs_count; extern int cellStyleXfs_count;
Blank::Blank() Blank::Blank()
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/CellOffsetResender.h" #include <Logic/Biff_structures/CellOffsetResender.h>
#include "../../Logic/Biff_structures/Cell.h" #include <Logic/Biff_structures/Cell.h>
namespace XLS namespace XLS
{; {
// Logical representation of Blank record in BIFF8 // Logical representation of Blank record in BIFF8
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
//#include <Exception/AttributeDataWrong.h> //#include <Exception/AttributeDataWrong.h>
namespace XLS namespace XLS
{; {
BookBool::BookBool() BookBool::BookBool()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of BookBool record in BIFF8 // Logical representation of BookBool record in BIFF8
......
#include "BookExt.h" #include "BookExt.h"
#include "../../Logic/Biff_structures/FrtHeader.h" #include <Logic/Biff_structures/FrtHeader.h>
namespace XLS namespace XLS
{; {
BookExt::BookExt() BookExt::BookExt()
: cb(22) : cb(22)
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/BookExt_Conditional11.h" #include <Logic/Biff_structures/BookExt_Conditional11.h>
#include "../../Logic/Biff_structures/BookExt_Conditional12.h" #include <Logic/Biff_structures/BookExt_Conditional12.h>
namespace XLS namespace XLS
{; {
// Logical representation of BookExt record in BIFF8 // Logical representation of BookExt record in BIFF8
......
#include "BoolErr.h" #include "BoolErr.h"
#include "../Common/simple_xml_writer.h" #include <simple_xml_writer.h>
namespace XLS namespace XLS
{; {
extern int cellStyleXfs_count; extern int cellStyleXfs_count;
BoolErr::BoolErr() BoolErr::BoolErr()
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/CellOffsetResender.h" #include <Logic/Biff_structures/CellOffsetResender.h>
#include "../../Logic/Biff_structures/Cell.h" #include <Logic/Biff_structures/Cell.h>
#include "../../Logic/Biff_structures/Bes.h" #include <Logic/Biff_structures/Bes.h>
namespace XLS namespace XLS
{; {
// Logical representation of BoolErr record in BIFF8 // Logical representation of BoolErr record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BopPop.h" #include "BopPop.h"
namespace XLS namespace XLS
{; {
BopPop::BopPop() BopPop::BopPop()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of BopPop record in BIFF8 // Logical representation of BopPop record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BopPopCustom.h" #include "BopPopCustom.h"
namespace XLS namespace XLS
{; {
BopPopCustom::BopPopCustom() BopPopCustom::BopPopCustom()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
class BopPopCustomPiesIndices : public BiffStructure class BopPopCustomPiesIndices : public BiffStructure
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BottomMargin.h" #include "BottomMargin.h"
namespace XLS namespace XLS
{; {
BottomMargin::BottomMargin() BottomMargin::BottomMargin()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of BottomMargin record in BIFF8 // Logical representation of BottomMargin record in BIFF8
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
//#include <Exception/AttributeDataWrong.h> //#include <Exception/AttributeDataWrong.h>
namespace XLS namespace XLS
{; {
BoundSheet8::BoundSheet8() BoundSheet8::BoundSheet8()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/BiffString.h" #include <Logic/Biff_structures/BiffString.h>
namespace XLS namespace XLS
{; {
// Logical representation of BoundSheet8 record in BIFF8 // Logical representation of BoundSheet8 record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "BuiltInFnGroupCount.h" #include "BuiltInFnGroupCount.h"
namespace XLS namespace XLS
{; {
BuiltInFnGroupCount::BuiltInFnGroupCount() BuiltInFnGroupCount::BuiltInFnGroupCount()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of BuiltInFnGroupCount record in BIFF8 // Logical representation of BuiltInFnGroupCount record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "CF.h" #include "CF.h"
namespace XLS namespace XLS
{; {
CF::CF(const CellRef& cell_base_ref) CF::CF(const CellRef& cell_base_ref)
: rgce1(cell_base_ref), : rgce1(cell_base_ref),
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/DXFN.h" #include <Logic/Biff_structures/DXFN.h>
#include "../../Logic/Biff_structures/CFParsedFormulaNoCCE.h" #include <Logic/Biff_structures/CFParsedFormulaNoCCE.h>
namespace XLS namespace XLS
{; {
// Logical representation of CF record in BIFF8 // Logical representation of CF record in BIFF8
......
#include "CF12.h" #include "CF12.h"
#include "../../Logic/Biff_structures/CFMultistate.h" #include <Logic/Biff_structures/CFMultistate.h>
namespace XLS namespace XLS
{; {
CF12::CF12(const CellRef& cell_base_ref) CF12::CF12(const CellRef& cell_base_ref)
: rgce1(cell_base_ref), : rgce1(cell_base_ref),
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/FrtRefHeader.h" #include <Logic/Biff_structures/FrtRefHeader.h>
#include "../../Logic/Biff_structures/DXFN12.h" #include <Logic/Biff_structures/DXFN12.h>
#include "../../Logic/Biff_structures/CFParsedFormulaNoCCE.h" #include <Logic/Biff_structures/CFParsedFormulaNoCCE.h>
#include "../../Logic/Biff_structures/CFParsedFormula.h" #include <Logic/Biff_structures/CFParsedFormula.h>
#include "../../Logic/Biff_structures/CFExTemplateParams.h" #include <Logic/Biff_structures/CFExTemplateParams.h>
namespace XLS namespace XLS
{; {
// Logical representation of CF12 record in BIFF8 // Logical representation of CF12 record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "CFEx.h" #include "CFEx.h"
namespace XLS namespace XLS
{; {
CFEx::CFEx() CFEx::CFEx()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/FrtRefHeaderU.h" #include <Logic/Biff_structures/FrtRefHeaderU.h>
#include "../../Logic/Biff_structures/CFExNonCF12.h" #include <Logic/Biff_structures/CFExNonCF12.h>
namespace XLS namespace XLS
{; {
// Logical representation of CFEx record in BIFF8 // Logical representation of CFEx record in BIFF8
......
#include "CRN.h" #include "CRN.h"
#include "../../Logic/Biff_structures/SerAr.h" #include <Logic/Biff_structures/SerAr.h>
namespace XLS namespace XLS
{; {
CRN::CRN() CRN::CRN()
{ {
......
#pragma once #pragma once
#include "BiffRecord.h" #include "BiffRecord.h"
#include "../../Logic/Biff_structures/SerAr.h" #include <Logic/Biff_structures/SerAr.h>
namespace XLS namespace XLS
{; {
// Logical representation of CRN record in BIFF8 // Logical representation of CRN record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "CalcCount.h" #include "CalcCount.h"
namespace XLS namespace XLS
{; {
CalcCount::CalcCount() CalcCount::CalcCount()
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BiffRecord.h" #include "BiffRecord.h"
namespace XLS namespace XLS
{; {
// Logical representation of CalcCount record in BIFF8 // Logical representation of CalcCount record in BIFF8
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "CalcDelta.h" #include "CalcDelta.h"
namespace XLS namespace XLS
{; {
CalcDelta::CalcDelta() CalcDelta::CalcDelta()
{ {
......
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