diff options
| author | Mark Hung <marklh9@gmail.com> | 2016-08-07 06:30:19 +0800 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-08-07 04:28:50 +0000 |
| commit | dde4e9a95479850bfc968fe712fe9e7ea7ef324e (patch) | |
| tree | 7f8859270a7198171fe30ac7dd5e2292aaf860a9 /sw/qa | |
| parent | dd612a61f9df81343ed5f810068002a7a25046a7 (diff) | |
Fix string concatenation in ww8export that breaks the build.
Fix what has been done in commit 07966a9. Replace string constant
concatenation with a single constructor.
Change-Id: I8a848cd0211a75321263b0b7413c079db9245471
Reviewed-on: https://gerrit.libreoffice.org/27928
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 747f1e4b4d46..a0b651eb6c27 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -569,14 +569,9 @@ DECLARE_WW8EXPORT_TEST(testTdf92281, "tdf92281.doc") xCursor->goRight( 5 , false ); uno::Reference< beans::XPropertySet > xPropSet(xCursor, uno::UNO_QUERY); - OUString sPMingLiUFont= OUString( sal_Unicode( 26032 ) ) + - OUString( sal_Unicode( 32048 ) ) + - OUString( sal_Unicode( 26126 ) ) + - OUString( sal_Unicode( 39636 ) ) + - OUString(";PMingLiU"); - + const sal_Unicode aFontname[14] = { 26032, 32048, 26126, 39636, ';' , 'P' , 'M', 'i', 'n', 'g', 'L', 'i', 'U' , 0 }; CPPUNIT_ASSERT_EQUAL(OUString("Calibri"), getProperty<OUString>(xPropSet, "CharFontName")); - CPPUNIT_ASSERT_EQUAL(sPMingLiUFont , getProperty<OUString>(xPropSet, "CharFontNameAsian")); + CPPUNIT_ASSERT_EQUAL(OUString(aFontname), getProperty<OUString>(xPropSet, "CharFontNameAsian")); CPPUNIT_ASSERT_EQUAL(OUString("Times New Roman"), getProperty<OUString>(xPropSet, "CharFontNameComplex")); } |