Skip to content

Commit

Permalink
xls/xlsb lib refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
ElenaSubbotina committed Jul 10, 2023
1 parent 410db15 commit 2e8820e
Show file tree
Hide file tree
Showing 220 changed files with 559 additions and 555 deletions.
31 changes: 31 additions & 0 deletions MsBinaryFile/Projects/XlsFormatLib/Windows/XlsFormat.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,20 @@
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\AntiMoniker.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\ArrayParsedFormula.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\Bes.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\Color.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\ColSpan.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\DValStrings.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormula.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormulas.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTHeader.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTParsedFormula.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRef.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRefs.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRelID.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqref.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqrefs.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\RelID.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\UncheckedSqRfX.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BiffString.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BiffStructure.cpp" />
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BookExt_Conditional11.cpp" />
Expand Down Expand Up @@ -1173,6 +1187,23 @@
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\AntiMoniker.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\ArrayParsedFormula.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\Bes.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\CellRangeRef.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\CellRef.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\Color.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\ColSpan.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\DValStrings.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormula.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormulas.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTHeader.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTParsedFormula.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRef.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRefs.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRelID.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqref.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqrefs.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\RelID.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\UncheckedSqRfX.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\XLWideString.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BiffAttribute.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BiffString.h" />
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BiffStructure.h" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<Filter Include="Logic\Biff_structures\ODRAW">
<UniqueIdentifier>{73faf489-4c86-4f5b-b26b-0d51a50612ad}</UniqueIdentifier>
</Filter>
<Filter Include="Logic\Biff_structures\BIFF12">
<UniqueIdentifier>{5654e677-b95e-42da-bac5-20d259c046e2}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\XlsFile\Format\Logging\Log.cpp">
Expand Down Expand Up @@ -2389,6 +2392,48 @@
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BiffStructure.cpp">
<Filter>Logic\Biff_structures</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\Color.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\ColSpan.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\DValStrings.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTHeader.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\RelID.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\UncheckedSqRfX.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormulas.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRefs.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRelID.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqrefs.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormula.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRef.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqref.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTParsedFormula.cpp">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\XlsFile\Format\Logging\Log.h">
Expand Down Expand Up @@ -4785,5 +4830,56 @@
<ClInclude Include="..\..\..\XlsFile\Format\Logic\XlsElementsType.h">
<Filter>Logic</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\Color.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\ColSpan.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\DValStrings.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTHeader.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\RelID.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\UncheckedSqRfX.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\XLWideString.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\CellRangeRef.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormulas.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRefs.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRelID.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqrefs.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTFormula.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTRef.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTSqref.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\FRTParsedFormula.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsFile\Format\Logic\Biff_structures\BIFF12\CellRef.h">
<Filter>Logic\Biff_structures\BIFF12</Filter>
</ClInclude>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Dv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "../../../../../OOXML/Base/Unit.h"
#include <boost/algorithm/string.hpp>

#include "../../../../../OOXML/XlsbFormat/Biff12_structures/DValStrings.h"
#include "../Biff_structures/BIFF12/DValStrings.h"


namespace XLS
Expand Down
4 changes: 2 additions & 2 deletions MsBinaryFile/XlsFile/Format/Logic/Biff_records/Dv.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "../Biff_structures/BiffString.h"
#include "../Biff_structures/DVParsedFormula.h"
#include "../Biff_structures/SqRefU.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/UncheckedSqRfX.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/FRTHeader.h"
#include "../Biff_structures/BIFF12/UncheckedSqRfX.h"
#include "../Biff_structures/BIFF12/FRTHeader.h"

namespace XLS
{
Expand Down
5 changes: 2 additions & 3 deletions MsBinaryFile/XlsFile/Format/Logic/Biff_records/FileSharing.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

#include "BiffRecord.h"
#include "../Biff_structures/BiffString.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../../../../../OOXML/XlsxFormat/WritingElement.h"
#include "../Biff_structures/BIFF12/XLWideString.h"
//#include "../../../../../OOXML/XlsxFormat/WritingElement.h"

namespace XLS
{
Expand All @@ -60,7 +60,6 @@ class FileSharing: public BiffRecord
_UINT16 iNoResPass;
XLUnicodeString stUNUsername;
XLSB::XLNullableWideString stUserName;

};

} // namespace XLS
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Font.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "Font.h"
#include "../Biff_structures/BiffString.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Font.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "BiffRecord.h"
#include "../Biff_structures/BorderFillInfo.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_records/Color.h"
#include "../Biff_structures/BIFF12/Color.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Lbl.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "BiffRecord.h"
#include "../Biff_structures/BiffString.h"
#include "../Biff_structures/NameParsedFormula.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"


namespace XLS
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Qsi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/

#include "Qsi.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Qsif.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/

#include "Qsif.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Row.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#pragma once

#include "BiffRecord.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/ColSpan.h"
#include "../Biff_structures/BIFF12/ColSpan.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/Selection.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#pragma once

#include "BiffRecord.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/UncheckedSqRfX.h"
#include "../Biff_structures/BIFF12/UncheckedSqRfX.h"
#include "../Biff_structures/CellRangeRef.h"
#include "../Biff_structures/PaneType.h"

Expand Down
4 changes: 2 additions & 2 deletions MsBinaryFile/XlsFile/Format/Logic/Biff_records/Setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
*/

#include "Setup.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/RelID.h"
#include "../Biff_structures/BIFF12/XLWideString.h"
#include "../Biff_structures/BIFF12/RelID.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/ShrFmla.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "BiffRecord.h"
#include "../Biff_structures/CellRangeRef.h"
#include "../Biff_structures/SharedParsedFormula.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/CellRangeRef.h"
#include "../Biff_structures/BIFF12/CellRangeRef.h"

namespace XLS
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/

#include "SortData.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/CellRangeRef.h"
#include "../Biff_structures/BIFF12/CellRangeRef.h"

namespace XLS
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/

#include "TableStyle.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"

namespace XLS
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/

#include "TableStyles.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"

namespace XLS
{
Expand Down
2 changes: 1 addition & 1 deletion MsBinaryFile/XlsFile/Format/Logic/Biff_records/UserBView.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "BiffRecord.h"
#include "../Biff_structures/BiffString.h"
#include "../../../../../OOXML/XlsbFormat/Biff12_structures/XLWideString.h"
#include "../Biff_structures/BIFF12/XLWideString.h"

namespace XLS
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_structures/CellRangeRef.h"
#include "../CellRangeRef.h"

namespace XLSB
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_structures/CellRef.h"
#include "../CellRef.h"


namespace XLSB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BiffStructure.h"
#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_records/BiffRecord.h"
#include "../BiffStructure.h"
#include "../../Biff_records/BiffRecord.h"

namespace XLSB
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@
*/
#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_records/BiffRecord.h"
#include "../../XlsxFormat/WritingElement.h"


#include "../../Biff_records/BiffRecord.h"
#include "../../../../../../OOXML/XlsxFormat/WritingElement.h"

namespace XLSB
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BiffStructure.h"
#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_records/BiffRecord.h"
#include "../BiffStructure.h"
#include "../../Biff_records/BiffRecord.h"
#include "XLWideString.h"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BiffStructure.h"
#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_records/BiffRecord.h"
#include "../BiffStructure.h"
#include "../../Biff_records/BiffRecord.h"
#include "FRTParsedFormula.h"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#pragma once

#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BiffStructure.h"
#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_records/BiffRecord.h"
#include "../BiffStructure.h"
#include "../../Biff_records/BiffRecord.h"
#include "FRTFormula.h"

namespace XLSB
Expand Down
Loading

0 comments on commit 2e8820e

Please sign in to comment.