[Libreoffice-commits] core.git: sw/qa

Stephan Bergmann sbergman at redhat.com
Thu Jan 14 06:06:55 PST 2016


 sw/qa/extras/mailmerge/mailmerge.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1305e7be74dba26d8612004473711f154835a94f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 14 15:06:18 2016 +0100

    -Werror=maybe-uninitialized (GCC 6)
    
    Change-Id: I1a174b4b86c1d6cfbdffc4540a33b67b7b5e60dd

diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index f359809..c741159 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -280,14 +280,14 @@ DECLARE_SHELL_MAILMERGE_TEST(testMultiPageAnchoredDraws, "multiple-page-anchored
 
     for (sal_Int32 i = 0; i < xDraws->getCount(); i++)
     {
-        text::TextContentAnchorType nAnchorType;
-        sal_uInt16 nAnchorPageNo;
         xPropertySet.set(xDraws->getByIndex(i), uno::UNO_QUERY);
 
-        xPropertySet->getPropertyValue( UNO_NAME_ANCHOR_TYPE ) >>= nAnchorType;
+        text::TextContentAnchorType nAnchorType;
+        CPPUNIT_ASSERT(xPropertySet->getPropertyValue( UNO_NAME_ANCHOR_TYPE ) >>= nAnchorType);
         CPPUNIT_ASSERT_EQUAL( text::TextContentAnchorType_AT_PAGE, nAnchorType );
 
-        xPropertySet->getPropertyValue( UNO_NAME_ANCHOR_PAGE_NO ) >>= nAnchorPageNo;
+        sal_uInt16 nAnchorPageNo = {};
+        CPPUNIT_ASSERT(xPropertySet->getPropertyValue( UNO_NAME_ANCHOR_PAGE_NO ) >>= nAnchorPageNo);
         // are all shapes are on different page numbers?
         CPPUNIT_ASSERT(pages.insert(nAnchorPageNo).second);
     }


More information about the Libreoffice-commits mailing list