diff options
| -rw-r--r-- | testtools/com/sun/star/comp/bridge/TestComponent.java | 4 | ||||
| -rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 6 | ||||
| -rw-r--r-- | testtools/source/bridgetest/cli/cli_cs_testobj.cs | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/idl/bridgetest.idl | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index a399595f0164..ecab1951c753 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -47,7 +47,7 @@ import test.testtools.bridgetest.TestStruct; import test.testtools.bridgetest.SmallStruct; import test.testtools.bridgetest.MediumStruct; import test.testtools.bridgetest.BigStruct; -import test.testtools.bridgetest.AllFloats; +import test.testtools.bridgetest.FourFloats; import test.testtools.bridgetest.XBridgeTest; import test.testtools.bridgetest.XBridgeTest2; import test.testtools.bridgetest.XCurrentContextChecker; @@ -488,7 +488,7 @@ public class TestComponent { return i_Struct; } - public AllFloats echoAllFloats( AllFloats i_Struct) throws com.sun.star.uno.RuntimeException { + public FourFloats echoFourFloats( FourFloats i_Struct) throws com.sun.star.uno.RuntimeException { return i_Struct; } diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index e894b6c8c0ec..9cc323de9343 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -548,9 +548,9 @@ static sal_Bool performTest( bRet = check( memcmp(&aIn, &aOut, sizeof(BigStruct)) == 0, "big struct test" ) && bRet; } { - AllFloats aIn(1.1f, 2.2f, 3.3f, 4.4f); - AllFloats aOut = xLBT->echoAllFloats(aIn); - bRet = check( memcmp(&aIn, &aOut, sizeof(AllFloats)) == 0, "all floats struct test" ) && bRet; + FourFloats aIn(3.3f, 4.4f, 5.5f, 6.6f); + FourFloats aOut = xLBT->echoFourFloats(aIn); + bRet = check( memcmp(&aIn, &aOut, sizeof(FourFloats)) == 0, "four floats struct test" ) && bRet; } { sal_Int32 i2 = xLBT->testPPCAlignment( 0, 0, 0, 0, 0xbeaf ); diff --git a/testtools/source/bridgetest/cli/cli_cs_testobj.cs b/testtools/source/bridgetest/cli/cli_cs_testobj.cs index 258445eea3ab..a1064d81db8c 100644 --- a/testtools/source/bridgetest/cli/cli_cs_testobj.cs +++ b/testtools/source/bridgetest/cli/cli_cs_testobj.cs @@ -239,7 +239,7 @@ public class BridgeTestObject : WeakBase, XRecursiveCall, XBridgeTest2 return arg; } - public AllFloats echoAllFloats(/*[in]*/AllFloats arg) + public FourFloats echoFourFloats(/*[in]*/FourFloats arg) { return arg; } diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 587eacabbfc5..a6188668aa5e 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -221,7 +221,7 @@ public: { return rStruct; } virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) throw(com::sun::star::uno::RuntimeException) { return rStruct; } - virtual AllFloats SAL_CALL echoAllFloats(const AllFloats& rStruct) throw(com::sun::star::uno::RuntimeException) + virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) throw(com::sun::star::uno::RuntimeException) { return rStruct; } virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(com::sun::star::uno::RuntimeException) { return i2; } diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl index 40a0066211ab..b8b2ef385c34 100644 --- a/testtools/source/bridgetest/idl/bridgetest.idl +++ b/testtools/source/bridgetest/idl/bridgetest.idl @@ -103,7 +103,7 @@ struct BigStruct /** * all floats, ia64 handles them specially */ -struct AllFloats +struct FourFloats { float a; float b; @@ -264,7 +264,7 @@ interface XBridgeTestBase : com::sun::star::uno::XInterface /** * register return test 4 */ - AllFloats echoAllFloats( [in] AllFloats aStruct ); + FourFloats echoFourFloats( [in] FourFloats aStruct ); /** * register return test 4 (i107182) |