[Libreoffice-commits] .: cppu/prj cppu/qa

[Caolán McNamara]

 cppu/prj/build.lst                   |    2 +-
 cppu/qa/cppumaker/test_cppumaker.cxx |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 056869b3e4499ea41c8d066f31c79ce48aaa2767
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 21:49:26 2011 +0000

    restore cppunit test, Sequence ctor from sal_Int32 is now explicit

diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index 8c6fa2f..0af8b30 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -11,4 +11,4 @@ cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
 cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
 cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
 cu	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
-#cu	cppu\qa\cppumaker				nmake	-	all cu_qa_cppumaker cu_util NULL
+cu	cppu\qa\cppumaker				nmake	-	all cu_qa_cppumaker cu_util NULL
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index c418d75..992aa80 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -479,9 +479,13 @@ void Test::testPolyStruct() {
         (com::sun::star::uno::makeAny(
             test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
          getValueType().getTypeName()));
+
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+        aEmptySequence;
+
     CPPUNIT_ASSERT_EQUAL(
-        (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, 0).
-         member1),
+        (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5,
+            aEmptySequence).member1),
         static_cast< sal_uInt32 >(5));
 }
 
@@ -505,11 +509,14 @@ std::ostream & operator <<(
 }
 
 void Test::testExceptions() {
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+        aEmptySequence;
+
     test::codemaker::cppumaker::TestException1 e11(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
         com::sun::star::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
-        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
+        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
     test::codemaker::cppumaker::TestException1 e12(e11);
     CPPUNIT_ASSERT_EQUAL(e11, e12);
     test::codemaker::cppumaker::TestException1 e13;
@@ -519,7 +526,7 @@ void Test::testExceptions() {
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
         com::sun::star::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
-        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
+        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
     test::codemaker::cppumaker::TestException2 e22(e21);
     CPPUNIT_ASSERT_EQUAL(e21, e22);
     test::codemaker::cppumaker::TestException2 e23;