diff options
| author | August Sodora <augsod@gmail.com> | 2012-01-15 23:55:04 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2012-01-16 11:37:34 -0500 |
| commit | ad5bc7a1ecbe41ae49860c7223fd9f99cb3c4697 (patch) | |
| tree | a7626ab7cc0ae011e9c461ee70bda16598b24610 /basic | |
| parent | 0ced88ad440995e1f84ba0712df1092bfc225c84 (diff) | |
String->OUString
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/inc/basic/sbdef.hxx | 3 | ||||
| -rw-r--r-- | basic/source/runtime/methods.cxx | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index fefdc374596e..d3a86152a469 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -30,13 +30,12 @@ #define _SB_SBDEF_HXX #include <basic/sbxdef.hxx> -#include <svl/svarray.hxx> #include <rtl/ustring.hxx> #include "basicdllapi.h" // Returns type name for Basic type, array flag is ignored // implementation: basic/source/runtime/methods.cxx -BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType ); +BASIC_DLLPUBLIC ::rtl::OUString getBasicTypeName( SbxDataType eType ); // Returns type name for Basic objects, especially // important for SbUnoObj instances diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index e6aef79f5e8d..e457b2e2e8f1 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3414,7 +3414,7 @@ RTLFUNC(VarType) } // Exported function -String getBasicTypeName( SbxDataType eType ) +rtl::OUString getBasicTypeName( SbxDataType eType ) { static const char* pTypeNames[] = { @@ -3462,8 +3462,7 @@ String getBasicTypeName( SbxDataType eType ) sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* ); if ( nPos < 0 || nPos >= nTypeNameCount ) nPos = nTypeNameCount - 1; - String aRetStr = String::CreateFromAscii( pTypeNames[nPos] ); - return aRetStr; + return rtl::OUString::createFromAscii(pTypeNames[nPos]); } String getObjectTypeName( SbxVariable* pVar ) |