sw/qa/extras/mailmerge/mailmerge.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 14195e415f125f2666db292230f550d1dc340628 Author: Mike Kaganski <[email protected]> Date: Thu May 24 04:43:10 2018 -0700 No constexpr for VC2013 Change-Id: Iecb53e741c7c0c35716e39a4a36addb0c53baa8b Reviewed-on: https://gerrit.libreoffice.org/54761 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 6203da94c616..2be8d6f8aee7 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -673,7 +673,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf102010, "empty.odt", "10-testing-addresses.od namespace { -constexpr char const* const EmptyValuesLegacyData[][8] +const char* const EmptyValuesLegacyData[][8] = { { "Heading", "Title: ", "First Name: firstname1", "Last Name: lastname1", "Title: First Name: firstname1", "First Name: firstname1 Last Name: lastname1", "Title: First Name: firstname1 Last Name: lastname1", "Trailing text" }, @@ -688,7 +688,7 @@ constexpr char const* const EmptyValuesLegacyData[][8] "Title: First Name: Last Name: lastname4", "Trailing text" }, { "Heading", "Title: title5", "First Name: ", "Last Name: ", "Title: title5 First Name: ", "First Name: Last Name: ", "Title: title5 First Name: Last Name: ", "Trailing text" } }; -constexpr char const* const EmptyValuesNewData[][8] +const char* const EmptyValuesNewData[][8] = { { "Heading", "First Name: firstname1", "Last Name: lastname1", "Title: First Name: firstname1", "First Name: firstname1 Last Name: lastname1", "Title: First Name: firstname1 Last Name: lastname1", "Trailing text" }, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
