sw/qa/extras/ww8export/ww8export.cxx | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit dde4e9a95479850bfc968fe712fe9e7ea7ef324e
Author: Mark Hung <mark...@gmail.com>
Date: Sun Aug 7 06:30:19 2016 +0800
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.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 747f1e4..a0b651e 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"));
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
