sw/qa/extras/ww8export/ww8export.cxx | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit a7339737f4bab4daf0c5843e36e2988919e6691f
Author: Miklos Vajna <vmik...@suse.cz>
Date: Tue Oct 30 18:05:46 2012 +0100
sw: work around random crashes in ww8export
Change-Id: If11bff5804770976f069a49a1c508744d6e1987b
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index de2c80d..7a205f1 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -98,12 +98,17 @@ void Test::testN325936()
void Test::testFdo45724()
{
+ // The text and background color of the control shape was not correct.
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
uno::Reference<drawing::XControlShape>
xControlShape(xDraws->getByIndex(0), uno::UNO_QUERY);
- uno::Reference<form::validation::XValidatableFormComponent>
xComponent(xControlShape->getControl(), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, getProperty<sal_uInt32>(xComponent,
"BackgroundColor"));
- CPPUNIT_ASSERT_EQUAL(OUString("xxx"),
xComponent->getCurrentValue().get<OUString>());
+ // This should not happen (the shape was there before the fix as well),
but let's avoid a segfault in some random cases...
+ if (xControlShape.is())
+ {
+ uno::Reference<form::validation::XValidatableFormComponent>
xComponent(xControlShape->getControl(), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, getProperty<sal_uInt32>(xComponent,
"BackgroundColor"));
+ CPPUNIT_ASSERT_EQUAL(OUString("xxx"),
xComponent->getCurrentValue().get<OUString>());
+ }
}
void Test::testFdo46020()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
