diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-17 12:41:41 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-17 19:47:12 +0100 |
| commit | ba43d4c596c9c6b8d98b749ffd7f69d4faf9826d (patch) | |
| tree | 5deaeb0f80f5f942d94615064fb11cab5c99e69a /sw/qa/extras/uiwriter | |
| parent | db55054afb9011f7dcafcc72b222e1456fa7f187 (diff) | |
tdf#115013: quote columns with spaces and properly escape characters
Unit test updated
Change-Id: If36c90c0ff372ce45666674d2487e6edf2536dbf
Reviewed-on: https://gerrit.libreoffice.org/48038
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/qa/extras/uiwriter')
| -rw-r--r-- | sw/qa/extras/uiwriter/data/datasource.ods | bin | 8038 -> 9596 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 8 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/qa/extras/uiwriter/data/datasource.ods b/sw/qa/extras/uiwriter/data/datasource.ods Binary files differindex 076659679575..81d78440656e 100644 --- a/sw/qa/extras/uiwriter/data/datasource.ods +++ b/sw/qa/extras/uiwriter/data/datasource.ods diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 43b492763f04..7e3a0d54e533 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -5761,7 +5761,9 @@ void SwUiWriterTest::testTdf113481() void SwUiWriterTest::testTdf115013() { - //create new writer document + const OUString sColumnName("Name with spaces, \"quotes\" and \\backslashes"); + + //create new writer document SwDoc* pDoc = createDoc(); { @@ -5777,7 +5779,7 @@ void SwUiWriterTest::testTdf115013() SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); CPPUNIT_ASSERT(pWrtShell); SwDBFieldType* pFieldType = static_cast<SwDBFieldType*>(pWrtShell->InsertFieldType( - SwDBFieldType(pDoc, "Name", aDBData))); + SwDBFieldType(pDoc, sColumnName, aDBData))); CPPUNIT_ASSERT(pFieldType); // Insert the field into document @@ -5800,7 +5802,7 @@ void SwUiWriterTest::testTdf115013() CPPUNIT_ASSERT(pField); OUString sColumn = static_cast<SwDBFieldType*>(pField->GetTyp())->GetColumnName(); // The column name must come correct after round trip - CPPUNIT_ASSERT_EQUAL(OUString("Name"), sColumn); + CPPUNIT_ASSERT_EQUAL(sColumnName, sColumn); } CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); |