Skip to content

C
core
Kaydet (Commit) f5798e94 authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

changes to "Replaced deprecated tools/String with OUString in ScAddInCol" 

Some further nitpicking changes to avoid a few more temporary conversion
objects.

Change-Id: I5faaa1f525aeafdc5004340a6cd05e0610c22182
üst 7b7d094c
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
sc/source/core/tool/addincol.cxx
Dosyayı görüntüle @ f5798e94
...@@ -889,9 +889,11 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& ...@@ -889,9 +889,11 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
rtl::OUString aFuncU = xFunc->getName(); rtl::OUString aFuncU = xFunc->getName();
// stored function name: (service name).(function) // stored function name: (service name).(function)
::rtl::OUString aFuncName = aServiceName; rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength());
aFuncName += ::rtl::OUString( '.' ); aFuncNameBuffer.append(aServiceName);
aFuncName += ::rtl::OUString( aFuncU ); aFuncNameBuffer.append('.');
aFuncNameBuffer.append(aFuncU);
rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear();
sal_Bool bValid = sal_True; sal_Bool bValid = sal_True;
long nVisibleCount = 0; long nVisibleCount = 0;
...@@ -919,35 +921,31 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& ...@@ -919,35 +921,31 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
if (bValid) if (bValid)
{ {
sal_uInt16 nCategory = lcl_GetCategory( sal_uInt16 nCategory = lcl_GetCategory(
::rtl::OUString( xAddIn->getProgrammaticCategoryName( aFuncU ) );
xAddIn->getProgrammaticCategoryName(
aFuncU ) ) );
rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU );
rtl::OUString aLocalU; ::rtl::OUString aLocalName;
try try
{ {
aLocalU = xAddIn-> aLocalName = xAddIn->
getDisplayFunctionName( aFuncU ); getDisplayFunctionName( aFuncU );
} }
catch(uno::Exception&) catch(uno::Exception&)
{ {
aLocalU = "###"; aLocalName = "###";
} }
::rtl::OUString aLocalName = ::rtl::OUString( aLocalU );
rtl::OUString aDescU; ::rtl::OUString aDescription;
try try
{ {
aDescU = xAddIn-> aDescription = xAddIn->
getFunctionDescription( aFuncU ); getFunctionDescription( aFuncU );
} }
catch(uno::Exception&) catch(uno::Exception&)
{ {
aDescU = "###"; aDescription = "###";
} }
::rtl::OUString aDescription( aDescU );
ScAddInArgDesc* pVisibleArgs = NULL; ScAddInArgDesc* pVisibleArgs = NULL;
if ( nVisibleCount > 0 ) if ( nVisibleCount > 0 )
...@@ -1105,9 +1103,11 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface ...@@ -1105,9 +1103,11 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
rtl::OUString aFuncU = xFunc->getName(); rtl::OUString aFuncU = xFunc->getName();
// stored function name: (service name).(function) // stored function name: (service name).(function)
::rtl::OUString aFuncName = rServiceName; rtl::OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength());
aFuncName += ::rtl::OUString( '.' ); aFuncNameBuffer.append(rServiceName);
aFuncName += ::rtl::OUString( aFuncU ); aFuncNameBuffer.append('.');
aFuncNameBuffer.append(aFuncU);
rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear();
// internal names are skipped because no FuncData exists // internal names are skipped because no FuncData exists
ScUnoAddInFuncData* pOldData = const_cast<ScUnoAddInFuncData*>( GetFuncData( aFuncName ) ); ScUnoAddInFuncData* pOldData = const_cast<ScUnoAddInFuncData*>( GetFuncData( aFuncName ) );
...@@ -1740,7 +1740,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) ...@@ -1740,7 +1740,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
long nColCount = pRowArr[nRow].getLength(); long nColCount = pRowArr[nRow].getLength();
const rtl::OUString* pColArr = pRowArr[nRow].getConstArray(); const rtl::OUString* pColArr = pRowArr[nRow].getConstArray();
for (nCol=0; nCol<nColCount; nCol++) for (nCol=0; nCol<nColCount; nCol++)
xMatrix->PutString( ::rtl::OUString( pColArr[nCol] ), xMatrix->PutString( pColArr[nCol],
static_cast<SCSIZE>(nCol), static_cast<SCSIZE>(nCol),
static_cast<SCSIZE>(nRow) ); static_cast<SCSIZE>(nRow) );
for (nCol=nColCount; nCol<nMaxColCount; nCol++) for (nCol=nColCount; nCol<nMaxColCount; nCol++)
......
sc/source/core/tool/compiler.cxx
Dosyayı görüntüle @ f5798e94
...@@ -166,7 +166,7 @@ void ScCompiler::fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) ...@@ -166,7 +166,7 @@ void ScCompiler::fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap )
{ {
::rtl::OUString aName; ::rtl::OUString aName;
if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName)) if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName))
xMap->putExternalSoftly( String(aName), pFuncData->GetOriginalName()); xMap->putExternalSoftly( aName, pFuncData->GetOriginalName());
else else
xMap->putExternalSoftly( pFuncData->GetUpperName(), xMap->putExternalSoftly( pFuncData->GetUpperName(),
pFuncData->GetOriginalName()); pFuncData->GetOriginalName());
...@@ -5242,7 +5242,7 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO ...@@ -5242,7 +5242,7 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO
{ {
::rtl::OUString aName; ::rtl::OUString aName;
if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName)) if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName))
aEntry.Name = String(aName); aEntry.Name = aName;
else else
aEntry.Name = pFuncData->GetUpperName(); aEntry.Name = pFuncData->GetUpperName();
} }
......
sc/source/filter/excel/xeformula.cxx
Dosyayı görüntüle @ f5798e94
...@@ -2343,7 +2343,7 @@ void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFunc ...@@ -2343,7 +2343,7 @@ void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFunc
if( mxData->mpLinkMgr && ScGlobal::GetAddInCollection()->GetExcelName( rExtFuncData.maFuncName, GetUILanguage(), aXclFuncName ) ) if( mxData->mpLinkMgr && ScGlobal::GetAddInCollection()->GetExcelName( rExtFuncData.maFuncName, GetUILanguage(), aXclFuncName ) )
{ {
sal_uInt16 nExtSheet, nExtName; sal_uInt16 nExtSheet, nExtName;
if( mxData->mpLinkMgr->InsertAddIn( nExtSheet, nExtName, String(aXclFuncName) ) ) if( mxData->mpLinkMgr->InsertAddIn( nExtSheet, nExtName, aXclFuncName ) )
{ {
AppendNameXToken( nExtSheet, nExtName, nSpaces ); AppendNameXToken( nExtSheet, nExtName, nSpaces );
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment