diff options
author | Sören Möller <soerenmoeller2001@gmail.com> | 2011-01-09 18:12:47 +0100 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-10 21:12:03 -0500 |
commit | 4cdd1c978ed2076ca59e91146b3cc04ab836c434 (patch) | |
tree | 54e037ba54b03b828513d6a09256c8c4d8583ebc /sc/source/core/tool/addincol.cxx | |
parent | f8d290f90a4ca200d29a667b9fa2d2d4ebead1be (diff) |
Changed String to OUString in public variables of ScFuncDesc
I have changed four public variables of ScFuncDesc in sc/inc/funcdesc.hxx from deprecated String to OUString and corrected all uses of these variables
Diffstat (limited to 'sc/source/core/tool/addincol.cxx')
-rw-r--r-- | sc/source/core/tool/addincol.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 9afecd22121e..cc9a194f74fa 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1048,7 +1048,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) { - String aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData + ::rtl::OUString aCompare = (::rtl::OUString)rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData ULONG nCount = rFunctionList.GetCount(); for (ULONG nPos=0; nPos<nCount; nPos++) @@ -1328,14 +1328,14 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r // nFIndex is set from outside - rDesc.pFuncName = new String( rFuncData.GetUpperLocal() ); //! upper? + rDesc.pFuncName = new ::rtl::OUString( rFuncData.GetUpperLocal() ); //! upper? rDesc.nCategory = rFuncData.GetCategory(); rDesc.nHelpId = rFuncData.GetHelpId(); String aDesc = rFuncData.GetDescription(); if (!aDesc.Len()) aDesc = rFuncData.GetLocalName(); // use name if no description is available - rDesc.pFuncDesc = new String( aDesc ); + rDesc.pFuncDesc = new ::rtl::OUString( aDesc ); // AddInArgumentType_CALLER is already left out in FuncData @@ -1345,18 +1345,18 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r BOOL bMultiple = FALSE; const ScAddInArgDesc* pArgs = rFuncData.GetArguments(); - rDesc.ppDefArgNames = new String*[nArgCount]; - rDesc.ppDefArgDescs = new String*[nArgCount]; + rDesc.ppDefArgNames = new ::rtl::OUString*[nArgCount]; + rDesc.ppDefArgDescs = new ::rtl::OUString*[nArgCount]; rDesc.pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgCount]; for ( long nArg=0; nArg<nArgCount; nArg++ ) { - rDesc.ppDefArgNames[nArg] = new String( pArgs[nArg].aName ); - rDesc.ppDefArgDescs[nArg] = new String( pArgs[nArg].aDescription ); + rDesc.ppDefArgNames[nArg] = new ::rtl::OUString( pArgs[nArg].aName ); + rDesc.ppDefArgDescs[nArg] = new ::rtl::OUString( pArgs[nArg].aDescription ); rDesc.pDefArgFlags[nArg].bOptional = pArgs[nArg].bOptional; rDesc.pDefArgFlags[nArg].bSuppress = false; // no empty names... - if ( rDesc.ppDefArgNames[nArg]->Len() == 0 ) + if ( rDesc.ppDefArgNames[nArg]->getLength() == 0 ) { String aDefName( RTL_CONSTASCII_USTRINGPARAM("arg") ); aDefName += String::CreateFromInt32( nArg+1 ); |