XlsFormatReader - fix #38293

This commit is contained in:
ElenaSubbotina
2018-08-02 17:07:55 +03:00
parent 8513ec5ae7
commit bf02eec8ef
3 changed files with 25 additions and 29 deletions

View File

@ -165,7 +165,7 @@ int AUTOFILTER::serialize(std::wostream & stream)
int pos = ref.find(sheet_name);
if (pos >= 0)
{
pos = ref.find(L"!");
pos = ref.rfind(L"!");
if (pos > 0)
ref.erase(0, pos + 1);
}

View File

@ -15,22 +15,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTFormatLib", "..\..\..\AS
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X2tTest", "X2tTest.vcproj", "{355A22F4-1394-4B82-B2F1-FF0ECFB9E3EF}"
ProjectSection(ProjectDependencies) = postProject
{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
{CBEDD0D1-10A8-45C1-AF81-8492F40964CA} = {CBEDD0D1-10A8-45C1-AF81-8492F40964CA}
{7B27E40E-F70A-4A74-A77C-0944D7931D15} = {7B27E40E-F70A-4A74-A77C-0944D7931D15}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
{DACBE6CA-E089-47D1-8CE7-C7DB59C15417} = {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}
{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
{7B27E40E-F70A-4A74-A77C-0944D7931D15} = {7B27E40E-F70A-4A74-A77C-0944D7931D15}
{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
{E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}
{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
{DACBE6CA-E089-47D1-8CE7-C7DB59C15417} = {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}
{CBEDD0D1-10A8-45C1-AF81-8492F40964CA} = {CBEDD0D1-10A8-45C1-AF81-8492F40964CA}
{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormat", "..\..\..\ASCOfficeXlsFile2\source\win32\XlsFormat.vcproj", "{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}"

View File

@ -686,14 +686,14 @@
</File>
</Filter>
<Filter
Name="_lib"
Name="111"
>
<File
RelativePath="..\..\..\build\lib\win_32\DjVuFile.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\DjVuFile.lib"
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\doctrenderer.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\doctrenderer.lib"
>
</File>
<File
@ -701,15 +701,11 @@
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\HtmlFile.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\HtmlFile.lib"
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\HtmlRenderer.lib"
>
</File>
<File
RelativePath="..\..\..\build\bin\icu\win_32\icuuc.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\HtmlRenderer.lib"
>
</File>
<File
@ -717,15 +713,19 @@
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\PdfReader.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\PdfReader.lib"
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\PdfWriter.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\PdfWriter.lib"
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\XpsFile.lib"
RelativePath="..\..\..\build\lib\win_32\DEBUG\UnicodeConverter.lib"
>
</File>
<File
RelativePath="..\..\..\build\lib\win_32\DEBUG\XpsFile.lib"
>
</File>
</Filter>
@ -753,10 +753,6 @@
RelativePath="..\..\..\Common\OfficeFileFormatChecker2.cpp"
>
</File>
<File
RelativePath="..\..\..\UnicodeConverter\UnicodeConverter.cpp"
>
</File>
</Files>
<Globals>
</Globals>