Cosmetic change to make it easier to see which parameter is the nth

Consequently put each parameter/argument on a separate line for the
get/setValues methods.

Will make it easier to add more parameters of such types and at such
positions that they catch errors in the C++/UNO bridge on more
platforms (specifically, the one for macOS on Apple Silicon).

Change-Id: I68578d0401358317f3baf913ef4d53009c8f5f2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105633
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>

8 files changed, 479 insertions, 170 deletions

diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 45aa2715ab33..13271d90c9cb 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -383,28 +383,66 @@ static bool performTest(
         aSetData.Sequence[0] = *static_cast<TestElement const *>(&aSetData);
         // aSetData.Sequence[1] is empty
         xLBT->setValues(
-            aSetData.Bool, aSetData.Char, aSetData.Byte, aSetData.Short,
-            aSetData.UShort, aSetData.Long, aSetData.ULong, aSetData.Hyper,
-            aSetData.UHyper, aSetData.Float, aSetData.Double, aSetData.Enum,
-            aSetData.String, aSetData.Interface, aSetData.Any,
-            aSetData.Sequence, aSetData);
+            aSetData.Bool,
+            aSetData.Char,
+            aSetData.Byte,
+            aSetData.Short,
+            aSetData.UShort,
+            aSetData.Long,
+            aSetData.ULong,
+            aSetData.Hyper,
+            aSetData.UHyper,
+            aSetData.Float,
+            aSetData.Double,
+            aSetData.Enum,
+            aSetData.String,
+            aSetData.Interface,
+            aSetData.Any,
+            aSetData.Sequence,
+            aSetData);
         {
             TestData aRet;
             TestData aRet2;
             xLBT->getValues(
-                aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
-                aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float,
-                aRet.Double, aRet.Enum, aRet.String, aRet.Interface, aRet.Any,
-                aRet.Sequence, aRet2);
+                aRet.Bool,
+                aRet.Char,
+                aRet.Byte,
+                aRet.Short,
+                aRet.UShort,
+                aRet.Long,
+                aRet.ULong,
+                aRet.Hyper,
+                aRet.UHyper,
+                aRet.Float,
+                aRet.Double,
+                aRet.Enum,
+                aRet.String,
+                aRet.Interface,
+                aRet.Any,
+                aRet.Sequence,
+                aRet2);
             bRet &= check(
                 equals(aData, aRet) && equals(aData, aRet2), "getValues test");
             // Set last retrieved values:
             TestData aSV2ret(
                 xLBT->setValues2(
-                    aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
-                    aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float,
-                    aRet.Double, aRet.Enum, aRet.String, aRet.Interface,
-                    aRet.Any, aRet.Sequence, aRet2));
+                    aRet.Bool,
+                    aRet.Char,
+                    aRet.Byte,
+                    aRet.Short,
+                    aRet.UShort,
+                    aRet.Long,
+                    aRet.ULong,
+                    aRet.Hyper,
+                    aRet.UHyper,
+                    aRet.Float,
+                    aRet.Double,
+                    aRet.Enum,
+                    aRet.String,
+                    aRet.Interface,
+                    aRet.Any,
+                    aRet.Sequence,
+                    aRet2));
             // Check inout sequence order (=> inout sequence parameter was
             // switched by test objects):
             TestElement temp(aRet.Sequence[0]);
@@ -439,10 +477,23 @@ static bool performTest(
             TestData aRet2;
             TestData aGVret(
                 xLBT->getValues(
-                    aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
-                    aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float,
-                    aRet.Double, aRet.Enum, aRet.String, aRet.Interface,
-                    aRet.Any, aRet.Sequence, aRet2));
+                    aRet.Bool,
+                    aRet.Char,
+                    aRet.Byte,
+                    aRet.Short,
+                    aRet.UShort,
+                    aRet.Long,
+                    aRet.ULong,
+                    aRet.Hyper,
+                    aRet.UHyper,
+                    aRet.Float,
+                    aRet.Double,
+                    aRet.Enum,
+                    aRet.String,
+                    aRet.Interface,
+                    aRet.Any,
+                    aRet.Sequence,
+                    aRet2));
             bRet &= check(
                 (equals(aData, aRet) && equals(aData, aRet2) &&
                  equals(aData, aGVret)),
diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
index b1246f6518e4..79d101f86fb9 100644
--- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
+++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
@@ -408,27 +408,67 @@ static bool performTest(XBridgeTest* xLBT)
         aSetData->Sequence[1] = new TestElement(); // empty struct
 
         xLBT->setValues(
-                aSetData->Bool, aSetData->Char, aSetData->Byte, aSetData->Short, aSetData->UShort,
-                aSetData->Long, aSetData->ULong, aSetData->Hyper, aSetData->UHyper, aSetData->Float, aSetData->Double,
-                aSetData->Enum, aSetData->String, aSetData->Interface, aSetData->Any, aSetData->Sequence, aSetData );
+                aSetData->Bool,
+                aSetData->Char,
+                aSetData->Byte,
+                aSetData->Short,
+                aSetData->UShort,
+                aSetData->Long,
+                aSetData->ULong,
+                aSetData->Hyper,
+                aSetData->UHyper,
+                aSetData->Float,
+                aSetData->Double,
+                aSetData->Enum,
+                aSetData->String,
+                aSetData->Interface,
+                aSetData->Any,
+                aSetData->Sequence,
+                aSetData );
 
         {
         TestDataElements* aRet = new TestDataElements();
         TestDataElements* aRet2 = new TestDataElements();
         xLBT->getValues(
-            & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short, & aRet->UShort,
-            & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper,
-            & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String,
-            & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 );
+            & aRet->Bool,
+            & aRet->Char,
+            & aRet->Byte,
+            & aRet->Short,
+            & aRet->UShort,
+            & aRet->Long,
+            & aRet->ULong,
+            & aRet->Hyper,
+            & aRet->UHyper,
+            & aRet->Float,
+            & aRet->Double,
+            & aRet->Enum,
+            & aRet->String,
+            & aRet->Interface,
+            & aRet->Any,
+            & aRet->Sequence,
+            & aRet2 );
 
         bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "getValues test") && bRet;
 
         // set last retrieved values
         TestDataElements* aSV2ret = xLBT->setValues2(
-            & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short, & aRet->UShort,
-            & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper, & aRet->Float,
-            & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any,
-            & aRet->Sequence, & aRet2 );
+            & aRet->Bool,
+            & aRet->Char,
+            & aRet->Byte,
+            & aRet->Short,
+            & aRet->UShort,
+            & aRet->Long,
+            & aRet->ULong,
+            & aRet->Hyper,
+            & aRet->UHyper,
+            & aRet->Float,
+            & aRet->Double,
+            & aRet->Enum,
+            & aRet->String,
+            & aRet->Interface,
+            & aRet->Any,
+            & aRet->Sequence,
+            & aRet2 );
 
         // check inout sequence order
         // => inout sequence parameter was switched by test objects
@@ -444,10 +484,22 @@ static bool performTest(XBridgeTest* xLBT)
         TestDataElements* aRet = new TestDataElements();
         TestDataElements* aRet2 = new TestDataElements();
         TestDataElements* aGVret = xLBT->getValues(
-            & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short,
-            & aRet->UShort, & aRet->Long, & aRet->ULong, & aRet->Hyper,
-            & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum,
-            & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence,
+            & aRet->Bool,
+            & aRet->Char,
+            & aRet->Byte,
+            & aRet->Short,
+            & aRet->UShort,
+            & aRet->Long,
+            & aRet->ULong,
+            & aRet->Hyper,
+            & aRet->UHyper,
+            & aRet->Float,
+            & aRet->Double,
+            & aRet->Enum,
+            & aRet->String,
+            & aRet->Interface,
+            & aRet->Any,
+            & aRet->Sequence,
             & aRet2 );
 
         bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) && compareData( aData, aGVret ), "getValues test" ) && bRet;
diff --git a/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs b/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
index 42c90743a2e8..7530d83cec80 100644
--- a/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
+++ b/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
@@ -393,27 +393,67 @@ bool performTest(XBridgeTest xLBT)
     aSetData.Sequence[1] = new TestElement(); // empty struct
 
     xLBT.setValues(
-        aSetData.Bool, aSetData.Char, aSetData.Byte, aSetData.Short, aSetData.UShort,
-        aSetData.Long, aSetData.ULong, aSetData.Hyper, aSetData.UHyper, aSetData.Float, aSetData.Double,
-        aSetData.Enum, aSetData.String, aSetData.Interface, aSetData.Any, aSetData.Sequence, aSetData );
+        aSetData.Bool,
+	aSetData.Char,
+	aSetData.Byte,
+	aSetData.Short,
+	aSetData.UShort,
+        aSetData.Long,
+	aSetData.ULong,
+	aSetData.Hyper,
+	aSetData.UHyper,
+	aSetData.Float,
+	aSetData.Double,
+        aSetData.Enum,
+	aSetData.String,
+	aSetData.Interface,
+	aSetData.Any,
+	aSetData.Sequence,
+	aSetData );
 
     {
 		TestDataElements aRet = new TestDataElements();
         TestDataElements aRet2 = new TestDataElements();
 		xLBT.getValues(
-			out aRet.Bool, out aRet.Char, out aRet.Byte, out aRet.Short, out aRet.UShort,
-			out aRet.Long, out aRet.ULong, out aRet.Hyper, out aRet.UHyper,
-            out aRet.Float, out aRet.Double, out aRet.Enum, out aRet.String,
-            out aRet.Interface, out aRet.Any, out aRet.Sequence, out aRet2 );
+			out aRet.Bool,
+			out aRet.Char,
+			out aRet.Byte,
+			out aRet.Short,
+			out aRet.UShort,
+			out aRet.Long,
+			out aRet.ULong,
+			out aRet.Hyper,
+			out aRet.UHyper,
+			out aRet.Float,
+			out aRet.Double,
+			out aRet.Enum,
+			out aRet.String,
+			out aRet.Interface,
+			out aRet.Any,
+			out aRet.Sequence,
+			out aRet2 );
 
 		bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "getValues test") && bRet;
 
 		// set last retrieved values
 		TestDataElements aSV2ret = xLBT.setValues2(
-			ref aRet.Bool, ref aRet.Char, ref aRet.Byte, ref aRet.Short, ref aRet.UShort,
-			ref aRet.Long, ref aRet.ULong, ref aRet.Hyper, ref aRet.UHyper, ref aRet.Float,
-            ref aRet.Double, ref aRet.Enum, ref aRet.String, ref aRet.Interface, ref aRet.Any,
-            ref aRet.Sequence, ref aRet2 );
+			ref aRet.Bool,
+			ref aRet.Char,
+			ref aRet.Byte,
+			ref aRet.Short,
+			ref aRet.UShort,
+			ref aRet.Long,
+			ref aRet.ULong,
+			ref aRet.Hyper,
+			ref aRet.UHyper,
+			ref aRet.Float,
+			ref aRet.Double,
+			ref aRet.Enum,
+			ref aRet.String,
+			ref aRet.Interface,
+			ref aRet.Any,
+			ref aRet.Sequence,
+			ref aRet2 );
 
         // check inout sequence order
         // => inout sequence parameter was switched by test objects
@@ -429,11 +469,23 @@ bool performTest(XBridgeTest xLBT)
 		TestDataElements aRet = new TestDataElements();
         TestDataElements aRet2 = new TestDataElements();
 		TestDataElements aGVret = xLBT.getValues(
-			out aRet.Bool, out aRet.Char, out aRet.Byte, out aRet.Short,
-            out aRet.UShort, out aRet.Long, out aRet.ULong, out aRet.Hyper,
-            out aRet.UHyper, out aRet.Float, out aRet.Double, out aRet.Enum,
-            out aRet.String, out aRet.Interface, out aRet.Any, out aRet.Sequence,
-            out aRet2 );
+			out aRet.Bool,
+			out aRet.Char,
+			out aRet.Byte,
+			out aRet.Short,
+			out aRet.UShort,
+			out aRet.Long,
+			out aRet.ULong,
+			out aRet.Hyper,
+			out aRet.UHyper,
+			out aRet.Float,
+			out aRet.Double,
+			out aRet.Enum,
+			out aRet.String,
+			out aRet.Interface,
+			out aRet.Any,
+			out aRet.Sequence,
+			out aRet2 );
 
 		bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) && compareData( aData, aGVret ), "getValues test" ) && bRet;
 
diff --git a/testtools/source/bridgetest/cli/cli_cs_testobj.cs b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
index 8f396c924cea..df8f4cdc3309 100644
--- a/testtools/source/bridgetest/cli/cli_cs_testobj.cs
+++ b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
@@ -88,22 +88,22 @@ public class BridgeTestObject : WeakBase, XRecursiveCall, XBridgeTest2
 
 
     public void setValues(
-        bool          bBool,
+        bool             bBool,
         char             cChar,
         byte             nByte,
         short            nShort,
-        ushort            nUShort,
+        ushort           nUShort,
         int              nLong,
-        uint              nULong,
+        uint             nULong,
         long             nHyper,
-        ulong             nUHyper,
+        ulong            nUHyper,
         float            fFloat,
         double           fDouble,
         TestEnum         testEnum,
         String           str,
         Object           xInterface,
         Any              any,
-        TestElement []      testElements,
+        TestElement []   testElements,
         TestDataElements testDataElements )
     {
          Debug.WriteLine( "##### " + GetType().FullName + ".setValues:" + any );
@@ -128,21 +128,21 @@ public class BridgeTestObject : WeakBase, XRecursiveCall, XBridgeTest2
     }
 
     public TestDataElements setValues2(
-        /*INOUT*/ref bool          io_bool,
+        /*INOUT*/ref bool             io_bool,
         /*INOUT*/ref char             io_char,
         /*INOUT*/ref byte             io_byte,
         /*INOUT*/ref short            io_short,
-        /*INOUT*/ref ushort            io_ushort,
+        /*INOUT*/ref ushort           io_ushort,
         /*INOUT*/ref int              io_long,
-        /*INOUT*/ref uint              io_ulong,
+        /*INOUT*/ref uint             io_ulong,
         /*INOUT*/ref long             io_hyper,
-        /*INOUT*/ref ulong             io_uhyper,
+        /*INOUT*/ref ulong            io_uhyper,
         /*INOUT*/ref float            io_float,
         /*INOUT*/ref double           io_double,
         /*INOUT*/ref TestEnum         io_testEnum,
         /*INOUT*/ref String           io_string,
         /*INOUT*/ref Object           io_xInterface,
-        /*INOUT*/ref Any           io_any,
+        /*INOUT*/ref Any              io_any,
         /*INOUT*/ref TestElement[]    io_testElements,
         /*INOUT*/ref TestDataElements io_testDataElements )
     {
@@ -174,21 +174,21 @@ public class BridgeTestObject : WeakBase, XRecursiveCall, XBridgeTest2
     }
 
     public TestDataElements getValues(
-        /*OUT*/out bool          o_bool,
+        /*OUT*/out bool             o_bool,
         /*OUT*/out char             o_char,
         /*OUT*/out byte             o_byte,
         /*OUT*/out short            o_short,
-        /*OUT*/out ushort            o_ushort,
+        /*OUT*/out ushort           o_ushort,
         /*OUT*/out int              o_long,
-        /*OUT*/out uint              o_ulong,
+        /*OUT*/out uint             o_ulong,
         /*OUT*/out long             o_hyper,
-        /*OUT*/out ulong             o_uhyper,
+        /*OUT*/out ulong            o_uhyper,
         /*OUT*/out float            o_float,
         /*OUT*/out double           o_double,
         /*OUT*/out TestEnum         o_testEnum,
         /*OUT*/out String           o_string,
         /*OUT*/out Object           o_xInterface,
-        /*OUT*/out Any           o_any,
+        /*OUT*/out Any              o_any,
         /*OUT*/out TestElement[]    o_testElements,
         /*OUT*/out TestDataElements o_testDataElements )
     {
diff --git a/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb b/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb
index ab5505485a82..b2139601cb0b 100644
--- a/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb
+++ b/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb
@@ -588,35 +588,68 @@ Public Class BridgeTest
         aSetData.Sequence(1) = New TestElement ' empty struct
 
 		xLBT.setValues( _
-				aSetData.Bool, aSetData.Char, aSetData.Byte, aSetData.Short, _
-                aSetData.UShort, aSetData.Long, aSetData.ULong, _
-                aSetData.Hyper, aSetData.UHyper, aSetData.Float, _
-                aSetData.Double, aSetData.Enum, aSetData.String, _
-                aSetData.Interface, aSetData.Any, aSetData.Sequence, _
-                aSetData )
+			aSetData.Bool, _
+			aSetData.Char, _
+			aSetData.Byte, _
+			aSetData.Short, _
+			aSetData.UShort, _
+			aSetData.Long, _
+			aSetData.ULong, _
+			aSetData.Hyper, _
+			aSetData.UHyper, _
+			aSetData.Float, _
+			aSetData.Double, _
+			aSetData.Enum, _
+			aSetData.String, _
+			aSetData.Interface, _
+			aSetData.Any, _
+			aSetData.Sequence, _
+			aSetData )
 		
 		
 		Dim aRet As New TestDataElements
         Dim aRet2 As New TestDataElements
 		xLBT.getValues( _
-			aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, _
-            aRet.UShort, aRet.Long, aRet.ULong, _
-            aRet.Hyper, aRet.UHyper, aRet.Float, _
-            aRet.Double, aRet.Enum, aRet.String, _
-            aRet.Interface, aRet.Any, aRet.Sequence, _
-            aRet2 )
+			aRet.Bool, _
+			aRet.Char, _
+			aRet.Byte, _
+			aRet.Short, _
+			aRet.UShort, _
+			aRet.Long, _
+			aRet.ULong, _
+			aRet.Hyper, _
+			aRet.UHyper, _
+			aRet.Float, _
+			aRet.Double, _
+			aRet.Enum, _
+			aRet.String, _
+			aRet.Interface, _
+			aRet.Any, _
+			aRet.Sequence, _
+			aRet2 )
 		
 		bRet = check( compareData( aData, aRet ) And _
                       compareData( aData, aRet2 ) , "getValues test") And bRet
         
 		' set last retrieved values
 		Dim  aSV2ret As TestDataElements= xLBT.setValues2( _
-			aRet.Bool, aRet.Char, aRet.Byte, _
-            aRet.Short, aRet.UShort, aRet.Long, _
-            aRet.ULong, aRet.Hyper, aRet.UHyper, _
-            aRet.Float, aRet.Double, aRet.Enum, _
-            aRet.String, aRet.Interface, aRet.Any, _
-            aRet.Sequence, aRet2 )
+			aRet.Bool, _
+			aRet.Char, _
+			aRet.Byte, _
+			aRet.Short, _
+			aRet.UShort, _
+			aRet.Long, _
+			aRet.ULong, _
+			aRet.Hyper, _
+			aRet.UHyper, _
+			aRet.Float, _
+			aRet.Double, _
+			aRet.Enum, _
+			aRet.String, _
+			aRet.Interface, _
+			aRet.Any, _
+			aRet.Sequence, _
+			aRet2 )
 		
         ' check inout sequence order
         ' => inout sequence parameter was switched by test objects
@@ -632,12 +665,23 @@ Public Class BridgeTest
 		aRet = New TestDataElements
         aRet2 = New TestDataElements
 		Dim  aGVret As TestDataElements= xLBT.getValues( _
-			aRet.Bool, aRet.Char, aRet.Byte, _ 
-            aRet.Short, aRet.UShort, aRet.Long, _
-            aRet.ULong, aRet.Hyper, aRet.UHyper, _
-            aRet.Float, aRet.Double, aRet.Enum, _
-            aRet.String, aRet.Interface, aRet.Any, _
-            aRet.Sequence, aRet2 )
+			aRet.Bool, _
+			aRet.Char, _
+			aRet.Byte, _
+			aRet.Short, _
+			aRet.UShort, _
+			aRet.Long, _
+			aRet.ULong, _
+			aRet.Hyper, _
+			aRet.UHyper, _
+			aRet.Float, _
+			aRet.Double, _
+			aRet.Enum, _
+			aRet.String, _
+			aRet.Interface, _
+			aRet.Any, _
+			aRet.Sequence, _
+			aRet2 )
 		
 		bRet = check( compareData( aData, aRet ) And _
                       compareData( aData, aRet2 ) And _ 
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 1a0e1bfdf214..ddd213c83bd0 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -169,38 +169,59 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XLBTestBase
-    virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
-                                     sal_Int16 nShort, sal_uInt16 nUShort,
-                                     sal_Int32 nLong, sal_uInt32 nULong,
-                                     sal_Int64 nHyper, sal_uInt64 nUHyper,
-                                     float fFloat, double fDouble,
-                                     TestEnum eEnum, const OUString& rStr,
+    virtual void SAL_CALL setValues( sal_Bool bBool,
+                                     sal_Unicode cChar,
+                                     sal_Int8 nByte,
+                                     sal_Int16 nShort,
+                                     sal_uInt16 nUShort,
+                                     sal_Int32 nLong,
+                                     sal_uInt32 nULong,
+                                     sal_Int64 nHyper,
+                                     sal_uInt64 nUHyper,
+                                     float fFloat,
+                                     double fDouble,
+                                     TestEnum eEnum,
+                                     const OUString& rStr,
                                      const css::uno::Reference< css::uno::XInterface >& xTest,
                                      const css::uno::Any& rAny,
                                      const css::uno::Sequence<TestElement >& rSequence,
                                      const ::test::testtools::bridgetest::TestDataElements& rStruct ) override;
 
-    virtual ::test::testtools::bridgetest::TestDataElements SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
-                                                sal_Int16& nShort, sal_uInt16& nUShort,
-                                                sal_Int32& nLong, sal_uInt32& nULong,
-                                                sal_Int64& nHyper, sal_uInt64& nUHyper,
-                                                float& fFloat, double& fDouble,
-                                                TestEnum& eEnum, OUString& rStr,
-                                                css::uno::Reference< css::uno::XInterface >& xTest,
-                                                css::uno::Any& rAny,
-                                                css::uno::Sequence<TestElement >& rSequence,
-                                                ::test::testtools::bridgetest::TestDataElements& rStruct ) override;
-
-    virtual ::test::testtools::bridgetest::TestDataElements SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
-                                               sal_Int16& nShort, sal_uInt16& nUShort,
-                                               sal_Int32& nLong, sal_uInt32& nULong,
-                                               sal_Int64& nHyper, sal_uInt64& nUHyper,
-                                               float& fFloat, double& fDouble,
-                                               TestEnum& eEnum, OUString& rStr,
-                                               css::uno::Reference< css::uno::XInterface >& xTest,
-                                               css::uno::Any& rAny,
-                                               css::uno::Sequence< TestElement >& rSequence,
-                                               ::test::testtools::bridgetest::TestDataElements& rStruct ) override;
+    virtual ::test::testtools::bridgetest::TestDataElements SAL_CALL setValues2( sal_Bool& bBool,
+                                                                                 sal_Unicode& cChar,
+                                                                                 sal_Int8& nByte,
+                                                                                 sal_Int16& nShort,
+                                                                                 sal_uInt16& nUShort,
+                                                                                 sal_Int32& nLong,
+                                                                                 sal_uInt32& nULong,
+                                                                                 sal_Int64& nHyper,
+                                                                                 sal_uInt64& nUHyper,
+                                                                                 float& fFloat,
+                                                                                 double& fDouble,
+                                                                                 TestEnum& eEnum,
+                                                                                 OUString& rStr,
+                                                                                 css::uno::Reference< css::uno::XInterface >& xTest,
+                                                                                 css::uno::Any& rAny,
+                                                                                 css::uno::Sequence<TestElement >& rSequence,
+                                                                                 ::test::testtools::bridgetest::TestDataElements& rStruct ) override;
+
+    virtual ::test::testtools::bridgetest::TestDataElements SAL_CALL getValues( sal_Bool& bBool,
+                                                                                sal_Unicode& cChar,
+                                                                                sal_Int8& nByte,
+                                                                                sal_Int16& nShort,
+                                                                                sal_uInt16& nUShort,
+                                                                                sal_Int32& nLong,
+                                                                                sal_uInt32& nULong,
+                                                                                sal_Int64& nHyper,
+                                                                                sal_uInt64& nUHyper,
+                                                                                float& fFloat,
+                                                                                double& fDouble,
+                                                                                TestEnum& eEnum,
+                                                                                OUString& rStr,
+                                                                                css::uno::Reference< css::uno::XInterface >& xTest,
+                                                                                css::uno::Any& rAny,
+                                                                                css::uno::Sequence< TestElement >& rSequence,
+                                                                                ::test::testtools::bridgetest::TestDataElements& rStruct ) override;
 
     virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) override
         { return rStruct; }
@@ -536,12 +557,19 @@ OUString Test_Impl::testMulti(Reference< XMulti > const & multi)
 }
 
 
-void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
-                           sal_Int16 nShort, sal_uInt16 nUShort,
-                           sal_Int32 nLong, sal_uInt32 nULong,
-                           sal_Int64 nHyper, sal_uInt64 nUHyper,
-                           float fFloat, double fDouble,
-                           TestEnum eEnum, const OUString& rStr,
+void Test_Impl::setValues( sal_Bool bBool,
+                           sal_Unicode cChar,
+                           sal_Int8 nByte,
+                           sal_Int16 nShort,
+                           sal_uInt16 nUShort,
+                           sal_Int32 nLong,
+                           sal_uInt32 nULong,
+                           sal_Int64 nHyper,
+                           sal_uInt64 nUHyper,
+                           float fFloat,
+                           double fDouble,
+                           TestEnum eEnum,
+                           const OUString& rStr,
                            const css::uno::Reference< css::uno::XInterface >& xTest,
                            const css::uno::Any& rAny,
                            const css::uno::Sequence<TestElement >& rSequence,
@@ -553,16 +581,23 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
     _aStructData = rStruct;
 }
 
-::test::testtools::bridgetest::TestDataElements Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
-                                sal_Int16& nShort, sal_uInt16& nUShort,
-                                sal_Int32& nLong, sal_uInt32& nULong,
-                                sal_Int64& nHyper, sal_uInt64& nUHyper,
-                                float& fFloat, double& fDouble,
-                                TestEnum& eEnum, OUString& rStr,
-                                css::uno::Reference< css::uno::XInterface >& xTest,
-                                css::uno::Any& rAny,
-                                css::uno::Sequence<TestElement >& rSequence,
-                                ::test::testtools::bridgetest::TestDataElements& rStruct )
+::test::testtools::bridgetest::TestDataElements Test_Impl::setValues2( sal_Bool& bBool,
+                                                                       sal_Unicode& cChar,
+                                                                       sal_Int8& nByte,
+                                                                       sal_Int16& nShort,
+                                                                       sal_uInt16& nUShort,
+                                                                       sal_Int32& nLong,
+                                                                       sal_uInt32& nULong,
+                                                                       sal_Int64& nHyper,
+                                                                       sal_uInt64& nUHyper,
+                                                                       float& fFloat,
+                                                                       double& fDouble,
+                                                                       TestEnum& eEnum,
+                                                                       OUString& rStr,
+                                                                       css::uno::Reference< css::uno::XInterface >& xTest,
+                                                                       css::uno::Any& rAny,
+                                                                       css::uno::Sequence<TestElement >& rSequence,
+                                                                       ::test::testtools::bridgetest::TestDataElements& rStruct )
 {
     assign( _aData,
             bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble,
@@ -576,16 +611,23 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
     return _aStructData;
 }
 
-::test::testtools::bridgetest::TestDataElements Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
-                               sal_Int16& nShort, sal_uInt16& nUShort,
-                               sal_Int32& nLong, sal_uInt32& nULong,
-                               sal_Int64& nHyper, sal_uInt64& nUHyper,
-                               float& fFloat, double& fDouble,
-                               TestEnum& eEnum, OUString& rStr,
-                               css::uno::Reference< css::uno::XInterface >& xTest,
-                               css::uno::Any& rAny,
-                               css::uno::Sequence<TestElement >& rSequence,
-                               ::test::testtools::bridgetest::TestDataElements& rStruct )
+::test::testtools::bridgetest::TestDataElements Test_Impl::getValues( sal_Bool& bBool,
+                                                                      sal_Unicode& cChar,
+                                                                      sal_Int8& nByte,
+                                                                      sal_Int16& nShort,
+                                                                      sal_uInt16& nUShort,
+                                                                      sal_Int32& nLong,
+                                                                      sal_uInt32& nULong,
+                                                                      sal_Int64& nHyper,
+                                                                      sal_uInt64& nUHyper,
+                                                                      float& fFloat,
+                                                                      double& fDouble,
+                                                                      TestEnum& eEnum,
+                                                                      OUString& rStr,
+                                                                      css::uno::Reference< css::uno::XInterface >& xTest,
+                                                                      css::uno::Any& rAny,
+                                                                      css::uno::Sequence<TestElement >& rSequence,
+                                                                      ::test::testtools::bridgetest::TestDataElements& rStruct )
 {
     bBool = _aData.Bool;
     cChar = _aData.Char;
diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl
index 4e99101807c9..0649867ae29a 100644
--- a/testtools/source/bridgetest/idl/bridgetest.idl
+++ b/testtools/source/bridgetest/idl/bridgetest.idl
@@ -227,15 +227,23 @@ interface XBridgeTestBase : com::sun::star::uno::XInterface
     /**
      * in parameter test, tests by calls reference also (complex types)
      */
-    void setValues( [in] boolean bBool, [in] char cChar, [in] byte nByte,
-                             [in] short nShort, [in] unsigned short nUShort,
-                             [in] long nLong, [in] unsigned long nULong,
-                             [in] hyper nHyper, [in] unsigned hyper nUHyper,
-                             [in] float fFloat, [in] double fDouble,
-                             [in] TestEnum eEnum, [in] string aString,
-                             [in] com::sun::star::uno::XInterface xInterface, [in] any aAny,
-                             [in] sequence< TestElement > aSequence,
-                             [in] TestData aStruct );
+    void setValues( [in] boolean bBool,
+                    [in] char cChar,
+                    [in] byte nByte,
+                    [in] short nShort,
+                    [in] unsigned short nUShort,
+                    [in] long nLong,
+                    [in] unsigned long nULong,
+                    [in] hyper nHyper,
+                    [in] unsigned hyper nUHyper,
+                    [in] float fFloat,
+                    [in] double fDouble,
+                    [in] TestEnum eEnum,
+                    [in] string aString,
+                    [in] com::sun::star::uno::XInterface xInterface,
+                    [in] any aAny,
+                    [in] sequence< TestElement > aSequence,
+                    [in] TestData aStruct );
     /**
      * inout parameter test
      *
@@ -243,26 +251,42 @@ interface XBridgeTestBase : com::sun::star::uno::XInterface
      *         by setValues or (if not called before) default constructed values.
      *
      */
-    TestData setValues2( [inout] boolean bBool, [inout] char cChar, [inout] byte nByte,
-                         [inout] short nShort, [inout] unsigned short nUShort,
-                         [inout] long nLong, [inout] unsigned long nULong,
-                         [inout] hyper nHyper, [inout] unsigned hyper nUHyper,
-                         [inout] float fFloat, [inout] double fDouble,
-                         [inout] TestEnum eEnum, [inout] string aString,
-                         [inout] com::sun::star::uno::XInterface xInterface, [inout] any aAny,
+    TestData setValues2( [inout] boolean bBool,
+                         [inout] char cChar,
+                         [inout] byte nByte,
+                         [inout] short nShort,
+                         [inout] unsigned short nUShort,
+                         [inout] long nLong,
+                         [inout] unsigned long nULong,
+                         [inout] hyper nHyper,
+                         [inout] unsigned hyper nUHyper,
+                         [inout] float fFloat,
+                         [inout] double fDouble,
+                         [inout] TestEnum eEnum,
+                         [inout] string aString,
+                         [inout] com::sun::star::uno::XInterface xInterface,
+                         [inout] any aAny,
                          [inout] sequence< TestElement > aSequence,
                          [inout] TestData aStruct );
 
     /**
      * out parameter test
      */
-    TestData getValues( [out] boolean bBool, [out] char cChar, [out] byte nByte,
-                        [out] short nShort, [out] unsigned short nUShort,
-                        [out] long nLong, [out] unsigned long nULong,
-                        [out] hyper nHyper, [out] unsigned hyper nUHyper,
-                        [out] float fFloat, [out] double fDouble,
-                        [out] TestEnum eEnum, [out] string aString,
-                        [out] com::sun::star::uno::XInterface xInterface, [out] any aAny,
+    TestData getValues( [out] boolean bBool,
+                        [out] char cChar,
+                        [out] byte nByte,
+                        [out] short nShort,
+                        [out] unsigned short nUShort,
+                        [out] long nLong,
+                        [out] unsigned long nULong,
+                        [out] hyper nHyper,
+                        [out] unsigned hyper nUHyper,
+                        [out] float fFloat,
+                        [out] double fDouble,
+                        [out] TestEnum eEnum,
+                        [out] string aString,
+                        [out] com::sun::star::uno::XInterface xInterface,
+                        [out] any aAny,
                         [out] sequence< TestElement > aSequence,
                         [out] TestData aStruct );
 
diff --git a/testtools/source/bridgetest/pyuno/samplecomponent.py b/testtools/source/bridgetest/pyuno/samplecomponent.py
index a434cd0b479c..4778a76022e0 100644
--- a/testtools/source/bridgetest/pyuno/samplecomponent.py
+++ b/testtools/source/bridgetest/pyuno/samplecomponent.py
@@ -67,17 +67,47 @@ class SampleUnoComponent( XBridgeTestBase,XServiceInfo ):
       def raiseRuntimeExceptionOneway(self, Message, Context ):
           raise RuntimeException( Message, Context )
 
-      def setValues( self, bBool, cChar, nByte, nShort, nUShort, nLong,\
-                     nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \
-                     aString, xInterface, aAny, aSequence, aStruct ):
+      def setValues( self, \
+                     bBool, \
+                     cChar, \
+                     nByte, \
+                     nShort, \
+                     nUShort, \
+                     nLong, \
+                     nULong, \
+                     nHyper, \
+                     nUHyper, \
+                     fFloat, \
+                     fDouble, \
+                     eEnum, \
+                     aString, \
+                     xInterface, \
+                     aAny, \
+                     aSequence, \
+                     aStruct ):
          self.__dict__["data"] = TestDataElements( bBool, cChar, nByte, nShort, nUShort, nLong,
                           nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface,
                           aAny, aSequence )
          self.__dict__["Struct"] = aStruct
 
-      def setValues2( self, bBool, cChar, nByte, nShort, nUShort, nLong, nULong,\
-                      nHyper, nUHyper, fFloat, fDouble, eEnum,          \
-                      aString, xInterface, aAny, aSequence, aStruct ):
+      def setValues2( self, \
+                      bBool, \
+                      cChar, \
+                      nByte, \
+                      nShort, \
+                      nUShort, \
+                      nLong, \
+                      nULong,\
+                      nHyper, \
+                      nUHyper, \
+                      fFloat, \
+                      fDouble, \
+                      eEnum, \
+                      aString, \
+                      xInterface, \
+                      aAny, \
+                      aSequence, \
+                      aStruct ):
           self.__dict__["Struct"] = TestData( cChar, nByte, nShort, nUShort, nLong, nULong, nHyper,\
                                               nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface,\
                                               aAny, aSequence )
@@ -86,7 +116,21 @@ class SampleUnoComponent( XBridgeTestBase,XServiceInfo ):
                  nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface, aAny,           \
                  (aSequence[1],aSequence[0]), aStruct
 
-      def getValues(self, a,b,c,d,e,f,g,h, i,j,k,l,m,n):
+      def getValues(self, \
+                    a, \
+                    b, \
+                    c, \
+                    d, \
+                    e, \
+                    f, \
+                    g, \
+                    h, \
+                    i, \
+                    j, \
+                    k, \
+                    l, \
+                    m, \
+                    n):
           v = self.__dict__["data"]
           return self.__dict__["Struct"],v.Bool, v.Char, v.Byte, v.Short, v.UShort, v.Long,     \
                  v.ULong, v.Hyper, v.UHyper, v.Float, v.Double, v.Enum, v.String, v.Interface,  \