pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

XlsFormat - правка по результатм тестирования + небольшое изменение для оптимизации

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68528 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2016-02-29 13:17:34 +00:00
committed by Alexander Trofimov
parent e0719ab40e
commit 9c9e114825
180 changed files with 476 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.h
View File

@ -28,7 +28,7 @@ public:
LongRGB rgbFore;
LongRGB rgbBack;
BIFF_WORD fls;
_UINT16 fls;
bool fAuto;
bool fInvertNeg;

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AutoFilter.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeAutoFilter;
BIFF_WORD iEntry;
_UINT16 iEntry;
BIFF_BYTE wJoin;
@ -34,7 +34,7 @@ public:
bool fPercent;
BIFF_BYTE fTop;
BIFF_WORD wTopN;
_UINT16 wTopN;
AFDOper doper1;
AFDOper doper2;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AutoFilter12.h
View File

@ -28,7 +28,7 @@ public:
static const ElementType type = typeAutoFilter12;
FrtRefHeader frtRefHeader;
BIFF_WORD iEntry;
_UINT16 iEntry;
BIFF_DWORD fHideArrow;
BIFF_DWORD ft;
BIFF_DWORD cft;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AutoFilterInfo.h
View File

@ -22,7 +22,7 @@ class AutoFilterInfo: public BiffRecord
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
//-----------------------------
BIFF_WORD cEntries;
_UINT16 cEntries;
};

16
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.h
View File

@ -25,14 +25,14 @@ public:
int serialize(std::wostream & _stream);
//-----------------------------
BIFF_WORD catMin;
BIFF_WORD catMax;
BIFF_WORD catMajor;
BIFF_WORD duMajor;
BIFF_WORD catMinor;
BIFF_WORD duMinor;
BIFF_WORD duBase;
BIFF_WORD catCrossDate;
_UINT16 catMin;
_UINT16 catMax;
_UINT16 catMajor;
_UINT16 duMajor;
_UINT16 catMinor;
_UINT16 duMinor;
_UINT16 duBase;
_UINT16 catCrossDate;
bool fAutoMin;
bool fAutoMax;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxesUsed.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeAxesUsed;
//-----------------------------
BIFF_WORD cAxes;
_UINT16 cAxes;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Axis.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeAxis;
//-----------------------------
BIFF_WORD wType;
_UINT16 wType;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxisLine.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeAxisLine;
//-----------------------------
BIFF_WORD id;
_UINT16 id;
};
} // namespace XLS

10
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BOF.h
View File

@ -38,10 +38,10 @@ public:
//-----------------------------
BIFF_WORD vers;
BIFF_WORD dt;
BIFF_WORD rupBuild;
BIFF_WORD rupYear;
_UINT16 vers;
_UINT16 dt;
_UINT16 rupBuild;
_UINT16 rupYear;
bool fWin;
bool fRisc;
@ -54,7 +54,7 @@ public:
bool fGlJmp;
bool fFontLimit;
BIFF_WORD verXLHigh;
_UINT16 verXLHigh;
BIFF_BYTE verLowestBiff;
BIFF_BYTE verLastXLSaved;

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.h
View File

@ -24,8 +24,8 @@ public:
int serialize(std::wostream & _stream);
BIFF_SHORT pcOverlap;
BIFF_WORD pcGap;
_INT16 pcOverlap;
_UINT16 pcGap;
bool fTranspose;
bool fStacked;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BigName.h
View File

@ -22,8 +22,6 @@ public:
static const ElementType type = typeBigName;
//-----------------------------
// BIFF_WORD userName;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Blank.cpp
View File

@ -49,7 +49,7 @@ int Blank::serialize(std::wostream & stream)
CP_XML_ATTR(L"r", ref);
int st = (int)cell.ixfe - global_info_->cellStyleXfs_count;
if ((cell.ixfe.value()) && (cell.ixfe > global_info_->cellStyleXfs_count))
if (cell.ixfe > global_info_->cellStyleXfs_count)
{
CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
}

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BoolErr.cpp
View File

@ -49,9 +49,9 @@ int BoolErr::serialize(std::wostream & stream)
{
CP_XML_ATTR(L"r", ref);
if (cell.ixfe.value())
if (cell.ixfe - global_info_->cellStyleXfs_count > 0)
{
CP_XML_ATTR(L"s", *cell.ixfe.value() - global_info_->cellStyleXfs_count);
CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
}
}
}

10
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.h
View File

@ -27,11 +27,11 @@ public:
//-----------------------------
BIFF_BYTE pst;
Boolean<unsigned char> fAutoSplit;
BIFF_WORD split;
BIFF_SHORT iSplitPos;
BIFF_SHORT pcSplitPercent;
BIFF_SHORT pcPie2Size;
BIFF_SHORT pcGap;
_UINT16 split;
_INT16 iSplitPos;
_INT16 pcSplitPercent;
_INT16 pcPie2Size;
_INT16 pcGap;
BIFF_DOUBLE numSplitValue;
bool fHasShadow;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BuiltInFnGroupCount.h
View File

@ -24,7 +24,7 @@ public:
//-----------------------------
BIFF_WORD count;
_UINT16 count;
};
} // namespace XLS

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CF12.h
View File

@ -40,8 +40,8 @@ public:
CFParsedFormulaNoCCE rgce2;
CFParsedFormula fmlaActive;
BIFF_WORD ipriority;
BIFF_WORD icfTemplate;
_UINT16 ipriority;
_UINT16 icfTemplate;
CFExTemplateParams rgbTemplateParms;
BiffStructurePtr rgbCT;

13
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CFEx.h
View File

@ -28,19 +28,8 @@ public:
//-----------------------------
FrtRefHeaderU frtRefHeaderU;
Boolean<unsigned int> fIsCF12;
BIFF_WORD nID;
_UINT16 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
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h
View File

@ -26,7 +26,7 @@ public:
//-----------------------------
BIFF_BYTE colLast;
BIFF_BYTE colFirst;
BIFF_WORD row;
_UINT16 row;
BiffStructurePtrVector crnOper;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CalcCount.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeCalcCount;
//-----------------------------
BIFF_SHORT cIter;
_INT16 cIter;
};
} // namespace XLS

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatLab.h
View File

@ -23,8 +23,8 @@ public:
static const ElementType type = typeCatLab;
//-----------------------------
BIFF_WORD wOffset;
BIFF_WORD at;
_UINT16 wOffset;
_UINT16 at;
bool cAutoCatLabelReal;
};

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.h
View File

@ -23,9 +23,9 @@ public:
static const ElementType type = typeCatSerRange;
//-----------------------------
BIFF_SHORT catCross;
BIFF_SHORT catLabel;
BIFF_SHORT catMark;
_INT16 catCross;
_INT16 catLabel;
_INT16 catMark;
bool fBetween;
bool fMaxCross;

12
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3d.h
View File

@ -23,12 +23,12 @@ public:
static const ElementType type = typeChart3d;
//-----------------------------
BIFF_SHORT anRot;
BIFF_SHORT anElev;
BIFF_SHORT pcDist;
BIFF_DWORD pcHeight;
BIFF_SHORT pcDepth;
BIFF_WORD pcGap;
_INT16 anRot;
_INT16 anElev;
_INT16 pcDist;
_UINT32 pcHeight;
_INT16 pcDepth;
_UINT16 pcGap;
bool fPerspective;
bool fCluster;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.h
View File

@ -25,7 +25,7 @@ public:
int serialize(std::wostream & _stream);
//-----------------------------
bool fVaried;
BIFF_WORD icrt;
_UINT16 icrt;
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CodePage.h
View File

@ -20,7 +20,7 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
//-----------------------------
BIFF_WORD cv;
_UINT16 cv;
};

14
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.cpp
View File

@ -38,12 +38,14 @@ void ColInfo::readFields(CFRecord& record)
{
unsigned short flags;
record >> colFirst >> colLast >> coldx >> ixfe >> flags;
fHidden = GETBIT(flags, 0);
fUserSet = GETBIT(flags, 1);
fBestFit = GETBIT(flags, 2);
fPhonetic = GETBIT(flags, 3);
iOutLevel = GETBITS(flags, 8, 10);
fCollapsed = GETBIT(flags, 12);
fHidden = GETBIT(flags, 0);
fUserSet = GETBIT(flags, 1);
fBestFit = GETBIT(flags, 2);
fPhonetic = GETBIT(flags, 3);
iOutLevel = GETBITS(flags, 8, 10);
fCollapsed = GETBIT(flags, 12);
record.skipNunBytes(2); // unused
}

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h
View File

@ -23,9 +23,9 @@ public:
static const ElementType type = typeColInfo;
//-----------------------------
Col256U colFirst;
Col256U colLast;
BIFF_WORD coldx;
_UINT16 colFirst;
_UINT16 colLast;
_UINT16 coldx;
IXFCell ixfe;
bool fHidden;

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CondFmt.h
View File

@ -26,9 +26,9 @@ public:
const CellRef getLocation() const;
//-----------------------------
BIFF_WORD ccf;
_UINT16 ccf;
bool fToughRecalc;
BIFF_WORD nID;
_UINT16 nID;
SqRefU sqref;
BIFF_BSTR refBound;
};

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ContinueBigName.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeContinueBigName;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ContinueFrt.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeContinueFrt;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Country.h
View File

@ -22,8 +22,8 @@ public:
static const ElementType type = typeCountry;
BIFF_WORD iCountryDef;
BIFF_WORD iCountryWinIni;
_UINT16 iCountryDef;
_UINT16 iCountryWinIni;
};

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrErr.h
View File

@ -21,14 +21,6 @@ public:
void readFields(CFRecord& record);
static const ElementType type = typeCrErr;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLayout12A.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeCrtLayout12A;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.h
View File

@ -24,7 +24,7 @@ public:
int serialize(std::wostream & _stream);
BIFF_WORD id;
_UINT16 id;
BaseObjectPtr m_LineFormat;
//-----------------------------

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrtContinue.h
View File

@ -22,14 +22,6 @@ public:
static const ElementType type = typeCrtMlFrtContinue;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBQueryExt.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeDBQueryExt;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

1
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.h
View File

@ -22,7 +22,6 @@ public:
static const ElementType type = typeDCon;
//-----------------------------
// BIFF_WORD userName;
unsigned short iiftab;
unsigned short fLeftCat;
unsigned short fTopCat;

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeDConBin;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConName.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeDConName;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConRef.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeDConRef;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConn.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeDConn;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataFormat.h
View File

@ -22,9 +22,9 @@ public:
static const ElementType type = typeDataFormat;
BIFF_WORD xi;
BIFF_WORD yi;
BIFF_WORD iss;
_UINT16 xi;
_UINT16 yi;
_UINT16 iss;
bool fUnknown;
};

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DbOrParamQry.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeDbOrParamQry;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DefColWidth.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeDefColWidth;
//-----------------------------
BIFF_WORD cchdefColWidth;
_UINT16 cchdefColWidth;
};
} // namespace XLS

26
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DefaultRowHeight.cpp
View File

@ -6,6 +6,7 @@ namespace XLS
DefaultRowHeight::DefaultRowHeight()
{
miyRw = -1;
}
@ -27,15 +28,10 @@ void DefaultRowHeight::writeFields(CFRecord& record)
SETBIT(flags, 1, fDyZero);
SETBIT(flags, 2, fExAsc);
SETBIT(flags, 3, fExDsc);
record << flags;
if(!fDyZero)
{
record << miyRw;
}
else
{
record << miyRwHidden;
}
record << miyRw;
}
@ -51,16 +47,10 @@ void DefaultRowHeight::readFields(CFRecord& record)
fExAsc = GETBIT(flags, 2);
fExDsc = GETBIT(flags, 3);
if(!fDyZero)
{
record >> miyRw;
global_info->defaultRowHeight = miyRw / 20.;
}
else
{
record >> miyRwHidden;
global_info->defaultRowHeight = miyRwHidden / 20.;
}
record >> miyRw;
global_info->defaultRowHeight = miyRw / 20.;
}
} // namespace XLS

3
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DefaultRowHeight.h
View File

@ -28,8 +28,7 @@ public:
bool fExAsc;
bool fExDsc;
BIFF_SHORT miyRw; // measured in twips (1/20 of of a printer's point)
BIFF_SHORT miyRwHidden;
_INT16 miyRw; // measured in twips (1/20 of of a printer's point)
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DefaultText.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeDefaultText;
//-----------------------------
BIFF_WORD id;
_UINT16 id;
};

5
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dimensions.cpp
View File

@ -46,11 +46,12 @@ void Dimensions::writeFields(CFRecord& record)
void Dimensions::readFields(CFRecord& record)
{
record >> rwMic >> rwMac >> colMic >> colMac;
record.skipNunBytes(2); // reserved
if(rwMac.value() && colMac.value())
if(rwMac >= 0 && colMac >= 0)
{
ref_ = static_cast<std::wstring >(CellRangeRef(CellRef(*rwMic.value(), *colMic.value(), true, true), CellRef(*rwMac.value() - 1, *colMac.value() - 1, true, true)).toString(false).c_str());
ref_ = static_cast<std::wstring >(CellRangeRef(CellRef(rwMic, colMic, true, true), CellRef(rwMac - 1, colMac - 1, true, true)).toString(false).c_str());
}
else
{

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dimensions.h
View File

@ -26,10 +26,10 @@ public:
std::wstring ref_;
//-----------------------------
RwLongU rwMic;
BIFF_DWORD rwMac;
ColU colMic;
BIFF_WORD colMac;
_UINT32 rwMic;
_UINT32 rwMac;
_UINT16 colMic;
_UINT16 colMac;
};

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DocRoute.h
View File

@ -21,14 +21,6 @@ public:
void readFields(CFRecord& record);
static const ElementType type = typeDocRoute;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DropBar.h
View File

@ -22,7 +22,7 @@ public:
static const ElementType type = typeDropBar;
BIFF_SHORT pcGap;
_INT16 pcGap;
};
} // namespace XLS

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DxGCol.h
View File

@ -23,12 +23,7 @@ public:
static const ElementType type = typeDxGCol;
//-----------------------------
BIFF_WORD dxgCol;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(dxgCol)
//BO_ATTRIB_MARKUP_END
_UINT16 dxgCol;
};
} // namespace XLS

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/EndObject.h
View File

@ -23,11 +23,7 @@ public:
static const ElementType type = typeEndObject;
//-----------------------------
BIFF_WORD iObjectKind;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(iObjectKind)
//BO_ATTRIB_MARKUP_END
_UINT16 iObjectKind;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExtSST.h
View File

@ -24,7 +24,7 @@ public:
static const ElementType type = typeExtSST;
//-----------------------------
BIFF_WORD dsst;
_UINT16 dsst;
BiffStructurePtrVector rgISSTInf;
BackwardOnlyParam<_UINT32> num_sets;

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExtString.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeExtString;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

38
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExternName.h
View File

@ -33,35 +33,25 @@ public:
bool fWantPict;
bool fOle;
bool fOleLink;
BIFF_WORD cf;
_UINT16 cf;
bool fIcon;
BiffStructurePtr body;
//-----------------------------
BIFF_WORD supbook_cch;
_UINT16 supbook_cch;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fBuiltIn)
//BO_ATTRIB_MARKUP_ATTRIB(fWantAdvise)
//BO_ATTRIB_MARKUP_ATTRIB(fWantPict)
//BO_ATTRIB_MARKUP_ATTRIB(fOle)
//BO_ATTRIB_MARKUP_ATTRIB(fOleLink)
//BO_ATTRIB_MARKUP_ATTRIB(cf)
//BO_ATTRIB_MARKUP_ATTRIB(fIcon)
//if(0x3A01 == supbook_cch)
//{
// if(!body)
// {
// body = BiffStructurePtr(new AddinUdf);
// }
// //BO_ATTRIB_MARKUP_COMPLEX(*body)
//}
//else
//{
// throw;// EXCEPT::LE::NotImplemented(__FUNCTION__);
//}
//BO_ATTRIB_MARKUP_END
//if(0x3A01 == supbook_cch)
//{
// if(!body)
// {
// body = BiffStructurePtr(new AddinUdf);
// }
// //BO_ATTRIB_MARKUP_COMPLEX(*body)
//}
//else
//{
// throw;// EXCEPT::LE::NotImplemented(__FUNCTION__);
//}
};

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Fbi.h
View File

@ -24,10 +24,10 @@ public:
static const ElementType type = typeFbi;
//-----------------------------
BIFF_WORD dmixBasis;
BIFF_WORD dmiyBasis;
BIFF_WORD twpHeightBasis;
BIFF_WORD scab;
_UINT16 dmixBasis;
_UINT16 dmiyBasis;
_UINT16 twpHeightBasis;
_UINT16 scab;
FontIndex ifnt;

11
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Feat.h
View File

@ -28,7 +28,7 @@ public:
//-----------------------------
SharedFeatureType isf;
BIFF_WORD cref;
_UINT16 cref;
BIFF_DWORD cbFeatData;
BiffStructurePtrVector refs;
BIFF_BSTR sqref;
@ -38,12 +38,6 @@ public:
FeatSmartTag smart_tag;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(isf)
//BO_ATTRIB_MARKUP_ATTRIB(cref)
//BO_ATTRIB_MARKUP_ATTRIB(sqref)
//BO_ATTRIB_MARKUP_ATTRIB(cbFeatData)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(refs, Ref8U)
//switch(isf)
//{
// case SharedFeatureType::ISFPROTECTION:
@ -57,9 +51,6 @@ public:
// break;
//}
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

24
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Feature11.h
View File

@ -28,26 +28,14 @@ public:
public:
FrtRefHeaderU frtRefHeaderU;
BIFF_WORD isf;
BIFF_WORD cref2;
BIFF_DWORD cbFeatData;
BiffStructurePtrVector refs2;
BIFF_BSTR sqref;
FrtRefHeaderU frtRefHeaderU;
_UINT16 isf;
_UINT16 cref2;
_UINT32 cbFeatData;
BiffStructurePtrVector refs2;
BIFF_BSTR sqref;
TableFeatureType rgbFeat;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtRefHeaderU)
//BO_ATTRIB_MARKUP_ATTRIB(isf)
//BO_ATTRIB_MARKUP_ATTRIB(cref2)
//BO_ATTRIB_MARKUP_ATTRIB(cbFeatData)
//BO_ATTRIB_MARKUP_ATTRIB(sqref)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(refs2, Ref8U)
//BO_ATTRIB_MARKUP_COMPLEX(rgbFeat)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FilePass.h
View File

@ -29,12 +29,11 @@ public:
//-----------------------------
Boolean<unsigned short> wEncryptionType;
XORObfuscation key;
BIFF_WORD majorVer;
_UINT16 majorVer;
CRYPTO::RC4EncryptionHeader rc4Header;
CRYPTO::RC4CryptoAPIEncryptionHeader rc4CryptoAPIHeader;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(wEncryptionType)
//if(!wEncryptionType)
//{
@ -49,7 +48,6 @@ public:
// //BO_ATTRIB_MARKUP_COMPLEX(rc4CryptoAPIHeader)
//}
//BO_ATTRIB_MARKUP_END
};

15
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FileSharing.h
View File

@ -27,21 +27,8 @@ public:
Boolean<unsigned short> fReadOnlyRec;
unsigned short wResPassNum;
BIFF_BSTR wResPass;
BIFF_WORD iNoResPass;
_UINT16 iNoResPass;
XLUnicodeString stUNUsername;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(fReadOnlyRec)
//BO_ATTRIB_MARKUP_ATTRIB(wResPass)
//if(!wResPassNum)
//{
// //BO_ATTRIB_MARKUP_ATTRIB(iNoResPass)
//}
//else
//{
// //BO_ATTRIB_MARKUP_ATTRIB(stUNUsername)
//}
//BO_ATTRIB_MARKUP_END
};

16
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp
View File

@ -83,12 +83,12 @@ int Font::serialize_rPr(std::wostream & stream, bool rtl, bool defRPr, std::wstr
CP_XML_NODE(strRpr)
{
if (dyHeight.value())
if (dyHeight > 0)
{
CP_XML_ATTR(L"sz", (int)(dyHeight/20. * 100));
}
if ((bls.value()) && (*bls.value() == 700))
if (bls == 700)
{
CP_XML_ATTR(L"b", true);
}
@ -125,7 +125,7 @@ int Font::serialize_rPr(std::wostream & stream, bool rtl, bool defRPr, std::wstr
// CP_XML_ATTR(L"val", fExtend);
// }
// }
if (((icv.value()) && (icv < 0x7fff)) || color_ext.enabled )
if ( (icv < 0x7fff) || color_ext.enabled )
{
if (color_ext.enabled )
{
@ -269,7 +269,7 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
{
CP_XML_WRITER(stream)
{
if ((bls.value()) && (*bls.value() == 700))
if ( bls== 700)
{
CP_XML_NODE(L"b")
{
@ -285,7 +285,7 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
}
}
if (((icv.value()) && (icv < 0x7fff)) || color_ext.enabled )
if (icv < 0x7fff || color_ext.enabled )
{
CP_XML_NODE(L"color")
{
@ -395,7 +395,7 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
}
}
if ((dyHeight.value()) && (dyHeight > 0))
if (dyHeight > 0)
{
CP_XML_NODE(L"sz")
{
@ -418,11 +418,11 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
}
}
if ((sss.value()) && (*sss.value() > 0))
if (sss > 0)
{
CP_XML_NODE(L"vertAlign")
{
switch(*sss.value())
switch(sss)
{
case 1: CP_XML_ATTR(L"val", L"superscript");break;
case 2: CP_XML_ATTR(L"val", L"subscript");break;

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h
View File

@ -33,7 +33,7 @@ public:
GlobalWorkbookInfoPtr global_info;
//-----------------------------
BIFF_WORD dyHeight; // measured in twips (1/20 of of a printer's point)
_UINT16 dyHeight; // measured in twips (1/20 of of a printer's point)
bool fItalic;
bool fStrikeOut;
@ -42,9 +42,9 @@ public:
bool fCondense;
bool fExtend;
BIFF_WORD icv;
BIFF_WORD bls;
BIFF_WORD sss;
_UINT16 icv;
_UINT16 bls;
_UINT16 sss;
BIFF_BYTE uls;
BIFF_BYTE bFamily;
BIFF_BYTE bCharSet;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FontX.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeFontX;
//-----------------------------
BIFF_WORD iFont;
_UINT16 iFont;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Format.h
View File

@ -25,7 +25,7 @@ public:
int serialize(std::wostream & stream);
//-----------------------------
BIFF_WORD ifmt;
_UINT16 ifmt;
XLUnicodeString stFormat;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Frame.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeFrame;
//-----------------------------
BIFF_WORD frt;
_UINT16 frt;
bool fAutoSize;
bool fAutoPosition;

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FrtFontList.h
View File

@ -22,12 +22,6 @@ public:
static const ElementType type = typeFrtFontList;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Guts.h
View File

@ -23,8 +23,8 @@ public:
static const ElementType type = typeGuts;
//-----------------------------
BIFF_WORD iLevelRwMac;
BIFF_WORD iLevelColMac;
_UINT16 iLevelRwMac;
_UINT16 iLevelColMac;
};

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/HeaderFooter.h
View File

@ -30,10 +30,10 @@ public:
bool fHFScaleWithDoc;
bool fHFAlignMargins;
BIFF_WORD cchHeaderEven;
BIFF_WORD cchFooterEven;
BIFF_WORD cchHeaderFirst;
BIFF_WORD cchFooterFirst;
_UINT16 cchHeaderEven;
_UINT16 cchFooterEven;
_UINT16 cchHeaderFirst;
_UINT16 cchFooterFirst;
XLUnicodeString strHeaderEven;
XLUnicodeString strFooterEven;

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/HorizontalPageBreaks.h
View File

@ -25,13 +25,8 @@ public:
//-----------------------------
BIFF_WORD cbrk;
_UINT16 cbrk;
BiffStructurePtrVector rgbrk;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(cbrk)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(rgbrk, HorzBrk)
//BO_ATTRIB_MARKUP_END
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/IFmtRecord.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typeIFmtRecord;
//-----------------------------
BIFF_WORD ifmt;
_UINT16 ifmt;
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/InterfaceHdr.h
View File

@ -21,7 +21,7 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
//-----------------------------
BIFF_WORD codePage;
_UINT16 codePage;
};
} // namespace XLS

9
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Intl.h
View File

@ -21,15 +21,6 @@ public:
void readFields(CFRecord& record);
static const ElementType type = typeIntl;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

12
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LRng.h
View File

@ -24,18 +24,10 @@ public:
static const ElementType type = typeLRng;
//-----------------------------
BIFF_WORD crefRw;
_UINT16 crefRw;
BiffStructurePtrVector refRow;
BIFF_WORD crefCol;
_UINT16 crefCol;
BiffStructurePtrVector refCol;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(crefRw)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(refRow, Ref8U)
//BO_ATTRIB_MARKUP_ATTRIB(crefCol)
//BO_ATTRIB_MARKUP_VECTOR_COMPLEX(refCol, Ref8U)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Label.cpp
View File

@ -51,7 +51,7 @@ int Label::serialize(std::wostream & stream)
CP_XML_ATTR(L"r", ref);
int st = (int)cell.ixfe - global_info_->cellStyleXfs_count;
if ((cell.ixfe.value()) && (cell.ixfe > global_info_->cellStyleXfs_count))
if (cell.ixfe > global_info_->cellStyleXfs_count)
{
CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
}

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LabelSst.cpp
View File

@ -50,7 +50,7 @@ int LabelSst::serialize(std::wostream & stream)
CP_XML_ATTR(L"r", ref);
int st = (int)cell.ixfe - global_info_->cellStyleXfs_count;
if ((cell.ixfe.value()) && (cell.ixfe > global_info_->cellStyleXfs_count))
if (cell.ixfe > global_info_->cellStyleXfs_count)
{
CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
}

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Lbl.h
View File

@ -39,7 +39,7 @@ public:
bool fWorkbookParam;
BIFF_BYTE chKey;
BIFF_WORD itab;
_UINT16 itab;
XLUnicodeStringNoCch Name_bin;
BIFF_BSTR Name;
NameParsedFormula rgce;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.h
View File

@ -20,7 +20,7 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
BIFF_WORD iss;
_UINT16 iss;
bool fDelete;
bool fLabel;

10
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.h
View File

@ -25,11 +25,11 @@ public:
int serialize(std::wostream & _stream);
//-----------------------------
LongRGB rgb;
BIFF_WORD lns;
BIFF_WORD we;
bool fAuto;
bool fAxisOn;
bool fAutoCo;
_UINT16 lns;
_UINT16 we;
bool fAuto;
bool fAxisOn;
bool fAutoCo;
IcvChart icv;
};

12
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/List12.h
View File

@ -26,7 +26,7 @@ public:
public:
FrtHeader frtHeader;
BIFF_WORD lsd;
_UINT16 lsd;
BIFF_DWORD idList;
List12BlockLevel rgbList12BlockLevel;
@ -34,12 +34,7 @@ public:
List12DisplayName rgbList12DisplayName;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_COMPLEX(frtHeader)
//BO_ATTRIB_MARKUP_ATTRIB(lsd)
//BO_ATTRIB_MARKUP_ATTRIB(idList)
//switch (lsd)
//switch (lsd)
//{
// case 0:
// //BO_ATTRIB_MARKUP_COMPLEX(rgbList12BlockLevel)
@ -51,9 +46,6 @@ public:
// //BO_ATTRIB_MARKUP_COMPLEX(rgbList12DisplayName)
// break;
//}
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.h
View File

@ -26,7 +26,7 @@ public:
LongRGB rgbFore;
LongRGB rgbBack;
BIFF_WORD imk;
_UINT16 imk;
bool fAuto;
bool fNotShowInt;
bool fNotShowBrd;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.cpp
View File

@ -71,7 +71,7 @@ int MulRk::serialize(std::wostream & stream)
{
CP_XML_ATTR(L"r", ref);
if ((cell->ixfe.value()) && (cell->ixfe > global_info_->cellStyleXfs_count))
if (cell->ixfe > global_info_->cellStyleXfs_count)
{
CP_XML_ATTR(L"s", cell->ixfe - global_info_->cellStyleXfs_count);
}

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.h
View File

@ -21,8 +21,8 @@ public:
void writeFields(CFRecord& record);
void readFields(CFRecord& record);
//-----------------------------
BIFF_WORD cachName;
BIFF_WORD fgrp;
_UINT16 cachName;
_UINT16 fgrp;
XLNameUnicodeString rgach;

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.cpp
View File

@ -56,7 +56,7 @@ int Number::serialize(std::wostream & stream)
{
CP_XML_ATTR(L"r", ref);
if ((cell.ixfe.value()) && (cell.ixfe > global_info_->cellStyleXfs_count))
if (cell.ixfe > global_info_->cellStyleXfs_count)
{
CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
}

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.h
View File

@ -22,9 +22,9 @@ public:
static const ElementType type = typeObjectLink;
BIFF_WORD wLinkObj;
BIFF_WORD wLinkVar1;
BIFF_WORD wLinkVar2;
_UINT16 wLinkObj;
_UINT16 wLinkVar1;
_UINT16 wLinkVar2;
//-------------------------------

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/OleDbConn.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeOleDbConn;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PLV.h
View File

@ -23,7 +23,7 @@ public:
static const ElementType type = typePLV;
//-----------------------------
BIFF_WORD wScalePLV;
_UINT16 wScalePLV;
bool fPageLayoutView;
bool fRulerVisible;

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pane.h
View File

@ -25,10 +25,10 @@ public:
static const ElementType type = typePane;
//-----------------------------
BIFF_WORD x;
BIFF_WORD y;
R_RwU rwTop;
ColU colLeft;
_UINT16 x;
_UINT16 y;
_UINT16 rwTop;
_UINT16 colLeft;
PaneType pnnAcct;
BIFF_BSTR topLeftCell;

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.h
View File

@ -25,8 +25,8 @@ public:
int serialize(std::wostream & _stream);
//-----------------------------
BIFF_WORD anStart;
BIFF_WORD pcDonut;
_UINT16 anStart;
_UINT16 pcDonut;
bool fHasShadow;
bool fShowLdrLines;
};

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.h
View File

@ -24,7 +24,7 @@ public:
int serialize(std::wostream & _stream);
BIFF_SHORT pcExplode;
_INT16 pcExplode;
};

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PivotChartBits.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typePivotChartBits;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.h
View File

@ -29,10 +29,10 @@ public:
_UINT16 mdTopLt;
_UINT16 mdBotRt;
BIFF_SHORT x1;
BIFF_SHORT y1;
BIFF_SHORT x2;
BIFF_SHORT y2;
_INT16 x1;
_INT16 y1;
_INT16 x2;
_INT16 y2;
//-----------------------------

6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PrintSize.h
View File

@ -23,11 +23,7 @@ public:
static const ElementType type = typePrintSize;
//-----------------------------
BIFF_WORD printSize;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(printSize)
//BO_ATTRIB_MARKUP_END
_UINT16 printSize;
};

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsi.h
View File

@ -21,14 +21,6 @@ public:
void readFields(CFRecord& record);
static const ElementType type = typeQsi;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/QsiSXTag.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeQsiSXTag;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsif.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeQsif;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

8
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.h
View File

@ -21,14 +21,6 @@ public:
void readFields(CFRecord& record);
static const ElementType type = typeQsir;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RK.cpp
View File

@ -53,7 +53,7 @@ int RK::serialize(std::wostream & stream)
{
CP_XML_ATTR(L"r", ref);
if ((cell.ixfe.value()) && (cell.ixfe > global_info_->cellStyleXfs_count))
if (cell.ixfe > global_info_->cellStyleXfs_count)
{
CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
}

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RealTimeData.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeRealTimeData;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

7
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RecipName.h
View File

@ -22,13 +22,6 @@ public:
static const ElementType type = typeRecipName;
//-----------------------------
// BIFF_WORD userName;
public:
//BO_ATTRIB_MARKUP_BEGIN
// //BO_ATTRIB_MARKUP_ATTRIB(userName)
//BO_ATTRIB_MARKUP_END
};
} // namespace XLS

4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.h
View File

@ -27,7 +27,7 @@ public:
BackwardOnlyParam<unsigned short> colMic;
BackwardOnlyParam<unsigned short> colMac;
BIFF_WORD miyRw;
_UINT16 miyRw;
BIFF_BYTE iOutLevel;
bool fCollapsed;
@ -35,7 +35,7 @@ public:
bool fUnsynced;
bool fGhostDirty;
BIFF_WORD ixfe_val;
_UINT16 ixfe_val;
bool fExAsc;
bool fExDes;
bool fPhonetic;

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