diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-12 11:32:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-12 21:17:45 +0000 |
| commit | b678a529a2f75b21c320479bad7140323cfa51ab (patch) | |
| tree | fa71e16ab1261bfc2edd63ac68c9e1de7acb3566 | |
| parent | 630940fba49a62d6b91121af622339f4d1bb9ab5 (diff) | |
RTL_CONSTASCII_USTRINGPARAM used with nonarray
(cherry picked from commit ac729f078b9dbdedcda9141eec30288c8c263d9e)
| -rw-r--r-- | binfilter/bf_basic/source/basmgr/basmgr.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx index a463740a0..cc1b0e1f7 100644 --- a/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -91,17 +91,16 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper; // Version 2 // + BOOL bReference -static const char* szStdLibName = "Standard"; -static const char* szBasicStorage = "StarBASIC"; -static const char* szOldManagerStream = "BasicManager"; -static const char* szManagerStream = "BasicManager2"; -static const char* szImbedded = "LIBIMBEDDED"; -static const char* szCryptingKey = "CryptedBasic"; -static const char* szScriptLanguage = "StarBasic"; - -static const String BasicStreamName( String::CreateFromAscii(szBasicStorage) ); -static const String ManagerStreamName( String::CreateFromAscii(szManagerStream) ); - +static const char szStdLibName[] = "Standard"; +static const char szBasicStorage[] = "StarBASIC"; +static const char szOldManagerStream[] = "BasicManager"; +static const char szManagerStream[] = "BasicManager2"; +static const char szImbedded[] = "LIBIMBEDDED"; +static const char szCryptingKey[] = "CryptedBasic"; +static const char szScriptLanguage[] = "StarBasic"; + +static const String BasicStreamName( RTL_CONSTASCII_USTRINGPARAM(szBasicStorage) ); +static const String ManagerStreamName( RTL_CONSTASCII_USTRINGPARAM(szManagerStream) ); #define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) |