sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7d7e2941d61262e957d4c857cac8dbf360ea128d
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sat Feb 22 05:58:51 2014 +0100
fix build
Change-Id: Ic21c92a02d42dc69d66a69de0e5d8e55ee1c8cb3
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 288c397..2a57a68 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3369,7 +3369,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing,
"dml-groupshape-paraspaci
// 1st paragraph has 1.5x line spacing but it has no spacing before/after.
uno::Reference<text::XTextRange> xRun = getRun(getParagraphOfText(1,
xText),1);
- ::com::sun::star::style::LineSpacing aLineSpacing =
getProperty<::com::sun::star::style::LineSpacing>(xRun, "ParaLineSpacing");
+ ::com::sun::star::style::LineSpacing aLineSpacing =
getProperty<com::sun::star::style::LineSpacing>(xRun, "ParaLineSpacing");
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP),
aLineSpacing.Mode);
CPPUNIT_ASSERT_EQUAL(sal_Int16(150), aLineSpacing.Height);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xRun,
"ParaTopMargin"));
@@ -3377,7 +3377,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing,
"dml-groupshape-paraspaci
// 2nd paragraph has double line spacing but it has no spacing
before/after.
xRun.set(getRun(getParagraphOfText(2, xText),1));
- aLineSpacing = getProperty<::com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
+ aLineSpacing = getProperty<com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP),
aLineSpacing.Mode);
CPPUNIT_ASSERT_EQUAL(sal_Int16(200), aLineSpacing.Height);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xRun,
"ParaTopMargin"));
@@ -3385,7 +3385,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing,
"dml-groupshape-paraspaci
// 3rd paragraph has 24 pt line spacing but it has no spacing before/after.
xRun.set(getRun(getParagraphOfText(3, xText),1));
- aLineSpacing = getProperty<::com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
+ aLineSpacing = getProperty<com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::MINIMUM),
aLineSpacing.Mode);
CPPUNIT_ASSERT_EQUAL(sal_Int16(847), aLineSpacing.Height);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xRun,
"ParaTopMargin"));
@@ -3393,7 +3393,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing,
"dml-groupshape-paraspaci
// 4th paragraph has 1.75x line spacing but it has no spacing before/after.
xRun.set(getRun(getParagraphOfText(4, xText),1));
- aLineSpacing = getProperty<::com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
+ aLineSpacing = getProperty<com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP),
aLineSpacing.Mode);
CPPUNIT_ASSERT_EQUAL(sal_Int16(175), aLineSpacing.Height);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xRun,
"ParaTopMargin"));
@@ -3401,7 +3401,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing,
"dml-groupshape-paraspaci
// 5th paragraph has margins which are defined by w:beforeLines and
w:afterLines.
xRun.set(getRun(getParagraphOfText(5, xText),1));
- aLineSpacing = getProperty<::com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
+ aLineSpacing = getProperty<com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP),
aLineSpacing.Mode);
CPPUNIT_ASSERT_EQUAL(sal_Int16(100), aLineSpacing.Height);
CPPUNIT_ASSERT_EQUAL(sal_Int32(635), getProperty<sal_Int32>(xRun,
"ParaTopMargin"));
@@ -3409,7 +3409,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing,
"dml-groupshape-paraspaci
// 6th paragraph has margins which are defined by w:before and w:after.
xRun.set(getRun(getParagraphOfText(6, xText),1));
- aLineSpacing = getProperty<::com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
+ aLineSpacing = getProperty<com::sun::star::style::LineSpacing>(xRun,
"ParaLineSpacing");
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP),
aLineSpacing.Mode);
CPPUNIT_ASSERT_EQUAL(sal_Int16(100), aLineSpacing.Height);
CPPUNIT_ASSERT_EQUAL(sal_Int32(423), getProperty<sal_Int32>(xRun,
"ParaTopMargin"));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
