diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-20 23:57:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-21 15:07:52 +0100 |
| commit | c3f2401d49b1374431da54e799a23bc122c5def7 (patch) | |
| tree | 81ea39989af360ca879c7a84e7b1643698255589 /sot/inc | |
| parent | 3d506e814719ecaa5862663bce467994ccf31a4d (diff) | |
reduce scope and replace some String::CreateFromAscii
Change-Id: I8c375e3bfbcd3d7046a8bdb1968934b7d7ca96f8
Diffstat (limited to 'sot/inc')
| -rw-r--r-- | sot/inc/sot/object.hxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index 239a4cd69d63..2e97cc23ae38 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -66,8 +66,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance ); \ + rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ } \ return *ppFactory; \ } \ @@ -103,8 +102,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance ); \ + rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ } \ return *ppFactory; \ @@ -145,8 +143,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance ); \ + rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ } \ @@ -187,8 +184,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance );\ + rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \ @@ -233,8 +229,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new SotFactory( GlobalName, \ - String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance );\ + rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \ |