summaryrefslogtreecommitdiff
path: root/stoc/test
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-31 17:49:01 +0200
committerNoel Grandin <noel@peralex.com>2013-11-08 14:50:59 +0200
commitcd30747b74683dc5766073a4a9b3a4c0e5db3723 (patch)
treea1833a51a2f501693100bb449e5a4b28f564379e /stoc/test
parentc3e55a1f3b88fd53d13f563a4116d588643c34d7 (diff)
remove unnecessary use of OUString constructor in STOC module
Change-Id: I980223cedb6d0054ef71cbd81691f70a24f506ad
Diffstat (limited to 'stoc/test')
-rw-r--r--stoc/test/testiadapter.cxx6
-rw-r--r--stoc/test/testintrosp.cxx46
-rw-r--r--stoc/test/testsmgr_cpnt.cxx6
3 files changed, 28 insertions, 30 deletions
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 779096ac3e7c..b9875d850cfe 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -855,7 +855,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
{
IllegalArgumentException aExc;
aExc.ArgumentPosition = 5;
- aExc.Message = OUString("dum dum dum ich tanz im kreis herum...");
+ aExc.Message = "dum dum dum ich tanz im kreis herum...";
aExc.Context = *this;
throw aExc;
}
@@ -863,7 +863,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException)
{
RuntimeException aExc;
- aExc.Message = OUString("dum dum dum ich tanz im kreis herum...");
+ aExc.Message = "dum dum dum ich tanz im kreis herum...";
aExc.Context = *this;
throw aExc;
}
@@ -871,7 +871,7 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE
void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException)
{
RuntimeException aExc;
- aExc.Message = OUString("dum dum dum ich tanz im kreis herum...");
+ aExc.Message = "dum dum dum ich tanz im kreis herum...";
aExc.Context = *this;
throw aExc;
}
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 06c3167c2c56..a9a68f89397d 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -102,19 +102,19 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
OUString aRetStr;
switch( eType )
{
- case TypeClass_TYPE: aRetStr = OUString("TYPE TYPE"); break;
- case TypeClass_INTERFACE: aRetStr = OUString("TYPE INTERFACE"); break;
- case TypeClass_SERVICE: aRetStr = OUString("TYPE SERVICE"); break;
- case TypeClass_STRUCT: aRetStr = OUString("TYPE STRUCT"); break;
- case TypeClass_TYPEDEF: aRetStr = OUString("TYPE TYPEDEF"); break;
- case TypeClass_UNION: aRetStr = OUString("TYPE UNION"); break;
- case TypeClass_ENUM: aRetStr = OUString("TYPE ENUM"); break;
- case TypeClass_EXCEPTION: aRetStr = OUString("TYPE EXCEPTION"); break;
- case TypeClass_ARRAY: aRetStr = OUString("TYPE ARRAY"); break;
- case TypeClass_SEQUENCE: aRetStr = OUString("TYPE SEQUENCE"); break;
- case TypeClass_VOID: aRetStr = OUString("TYPE void"); break;
- case TypeClass_ANY: aRetStr = OUString("TYPE any"); break;
- case TypeClass_UNKNOWN: aRetStr = OUString("TYPE unknown"); break;
+ case TypeClass_TYPE: aRetStr = "TYPE TYPE"; break;
+ case TypeClass_INTERFACE: aRetStr = "TYPE INTERFACE"; break;
+ case TypeClass_SERVICE: aRetStr = "TYPE SERVICE"; break;
+ case TypeClass_STRUCT: aRetStr = "TYPE STRUCT"; break;
+ case TypeClass_TYPEDEF: aRetStr = "TYPE TYPEDEF"; break;
+ case TypeClass_UNION: aRetStr = "TYPE UNION"; break;
+ case TypeClass_ENUM: aRetStr = "TYPE ENUM"; break;
+ case TypeClass_EXCEPTION: aRetStr = "TYPE EXCEPTION"; break;
+ case TypeClass_ARRAY: aRetStr = "TYPE ARRAY"; break;
+ case TypeClass_SEQUENCE: aRetStr = "TYPE SEQUENCE"; break;
+ case TypeClass_VOID: aRetStr = "TYPE void"; break;
+ case TypeClass_ANY: aRetStr = "TYPE any"; break;
+ case TypeClass_UNKNOWN: aRetStr = "TYPE unknown"; break;
case TypeClass_BOOLEAN:
{
sal_Bool b = *(sal_Bool*)aValue.getValue();
@@ -215,17 +215,17 @@ Sequence< Property > ImplPropertySetInfo::getProperties(void)
pSeq = new Sequence<Property>( 3 );
Property * pAry = pSeq->getArray();
- pAry[0].Name = OUString("Factor");
+ pAry[0].Name = "Factor";
pAry[0].Handle = -1;
pAry[0].Type = getCppuType( (double*) NULL );
pAry[0].Attributes = BOUND | TRANSIENT;
- pAry[1].Name = OUString("MyCount");
+ pAry[1].Name = "MyCount";
pAry[1].Handle = -1;
pAry[1].Type = getCppuType( (sal_Int32*) NULL );
pAry[1].Attributes = BOUND | TRANSIENT;
- pAry[2].Name = OUString("Info");
+ pAry[2].Name = "Info";
pAry[2].Handle = -1;
pAry[2].Type = getCppuType( (OUString*) NULL );
pAry[2].Attributes = TRANSIENT;
@@ -439,7 +439,7 @@ void ImplIntroTest::Init( void )
// Properties initialization
aAnyArray[0] <<= 3.14;
aAnyArray[1] <<= (sal_Int32)42;
- aAnyArray[2] <<= OUString( OUString("Hallo") );
+ aAnyArray[2] <<= OUString( "Hallo" );
// Einmal fuer den internen Gebrauch die PropertySetInfo abholen
m_xMyInfo = getPropertySetInfo();
@@ -457,13 +457,12 @@ void ImplIntroTest::Init( void )
// String-Sequence initialization
aStringSeq.realloc( 3 );
- OUString* pStr = aStringSeq.getArray();
- pStr[ 0 ] = OUString( OUString("String 0") );
- pStr[ 1 ] = OUString( OUString("String 1") );
- pStr[ 2 ] = OUString( OUString("String 2") );
+ aStringSeq[ 0 ] = "String 0";
+ aStringSeq[ 1 ] = "String 1";
+ aStringSeq[ 2 ] = "String 2";
// structs initialization
- m_aFirstStruct.Name = OUString("FirstStruct-Name");
+ m_aFirstStruct.Name = "FirstStruct-Name";
m_aFirstStruct.Handle = 77777;
//XIdlClassRef Type;
m_aFirstStruct.Attributes = -222;
@@ -1199,8 +1198,7 @@ SAL_IMPLEMENT_MAIN()
OSL_ENSURE( xRefl.is(), "### no corereflection!" );
// Introspection
- libName = OUString(
- "introspection.uno" SAL_DLLEXTENSION);
+ libName = OUString( "introspection.uno" SAL_DLLEXTENSION);
fprintf(stderr, "3\n" );
xImplReg->registerImplementation(OUString("com.sun.star.loader.SharedLibrary"),
libName, Reference< XSimpleRegistry >() );
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index d077821c3f5a..f6801406d68c 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -155,8 +155,8 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw ()
Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) throw ()
{
Sequence< OUString > aSNS( 2 );
- aSNS.getArray()[0] = OUString(SERVICE_NAME);
- aSNS.getArray()[1] = OUString("com.sun.star.bridge.Bridge");
+ aSNS.getArray()[0] = SERVICE_NAME;
+ aSNS.getArray()[1] = "com.sun.star.bridge.Bridge";
return aSNS;
}
@@ -179,7 +179,7 @@ extern "C" void SAL_CALL test_ServiceManager()
#if ! defined SAL_DLLPREFIX
#define SAL_DLLPREFIX ""
#endif
- OUString atUModule2 = OUString( SAL_DLLPREFIX "testsmgr_component" SAL_DLLEXTENSION );
+ OUString atUModule2 = SAL_DLLPREFIX "testsmgr_component" SAL_DLLEXTENSION ;
// expand shared library name
OString atModule2( OUStringToOString(atUModule2, RTL_TEXTENCODING_ASCII_US) );