oox/source/vml/vmlinputstream.cxx | 2 +-
sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 19 +++++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit b118760cade7350b91e56d92eec22b8d9129c4a4
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Thu Oct 4 17:55:42 2018 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Oct 8 11:24:48 2018 +0200
tdf#120301 oox: lclIsWhiteSpace should return true for a space
Reviewed-on: https://gerrit.libreoffice.org/61388
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
(cherry picked from commit 2cae2ecfef47d8dd10647c10f9577392c1887d3a)
Change-Id: I72c79c1fed4d9a91bf02024eef23cd3b1a58632e
diff --git a/oox/source/vml/vmlinputstream.cxx
b/oox/source/vml/vmlinputstream.cxx
index 3afcbaa8f32c..6aff31514710 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -43,7 +43,7 @@ inline const sal_Char* lclFindCharacter( const sal_Char*
pcBeg, const sal_Char*
inline bool lclIsWhiteSpace( sal_Char cChar )
{
- return cChar < 32;
+ return cChar <= 32;
}
const sal_Char* lclFindWhiteSpace( const sal_Char* pcBeg, const sal_Char*
pcEnd )
diff --git a/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx
b/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx
new file mode 100644
index 000000000000..0677a0cf2eb2
Binary files /dev/null and
b/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index ea212bc659cb..56cc573a91a1 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -233,6 +233,7 @@ public:
void testPageScalingXLSX();
void testActiveXCheckboxXLSX();
+ void testtdf120301_xmlSpaceParsingXLSX();
#ifdef UNX
void testUnicodeFileNameGnumeric();
#endif
@@ -357,6 +358,7 @@ public:
CPPUNIT_TEST(testPageScalingXLSX);
CPPUNIT_TEST(testActiveXCheckboxXLSX);
+ CPPUNIT_TEST(testtdf120301_xmlSpaceParsingXLSX);
#ifdef UNX
CPPUNIT_TEST(testUnicodeFileNameGnumeric);
#endif
@@ -3641,6 +3643,23 @@ void ScFiltersTest::testActiveXCheckboxXLSX()
xDocSh->DoClose();
}
+void ScFiltersTest::testtdf120301_xmlSpaceParsingXLSX()
+{
+ ScDocShellRef xDocSh = loadDoc("tdf120301_xmlSpaceParsing.", FORMAT_XLSX);
+ uno::Reference< frame::XModel > xModel = xDocSh->GetModel();
+ uno::Reference< sheet::XSpreadsheetDocument > xDoc(xModel,
UNO_QUERY_THROW);
+ uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
+ uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier(
xIA->getByIndex(0), UNO_QUERY_THROW);
+ uno::Reference< container::XIndexAccess >
xIA_DrawPage(xDrawPageSupplier->getDrawPage(), UNO_QUERY_THROW);
+
+ uno::Reference< drawing::XControlShape >
xControlShape(xIA_DrawPage->getByIndex(0), UNO_QUERY_THROW);
+ uno::Reference< beans::XPropertySet > XPropSet(
xControlShape->getControl(), uno::UNO_QUERY_THROW );
+ OUString sCaption;
+ XPropSet->getPropertyValue("Label") >>= sCaption;
+ CPPUNIT_ASSERT_EQUAL(OUString("Check Box 1"), sCaption);
+ xDocSh->DoClose();
+}
+
ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( "sc/qa/unit/data" )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
