diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-17 11:47:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:13 +0200 |
| commit | d109f1660ec75e1253232dbf09d9cdc185b8386a (patch) | |
| tree | 1e2c0a0ea5fa6d6c376cac5fa1f1e569ed0e0adc /sc | |
| parent | 6e6d442769cc47a84cd000a04af4d11cd7d27b51 (diff) | |
convert sc/source/core/inc/adiasync.hxx from String to OUString
Change-Id: I801f66fda248a878b1f3d2b75568299178ca24b4
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/inc/adiasync.hxx | 6 | ||||
| -rw-r--r-- | sc/source/core/tool/adiasync.cxx | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index 4fba1171ef5c..5fb5aea6053a 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.hxx @@ -32,15 +32,13 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ); class ScDocument; class ScAddInDocs : public std::set<ScDocument*> {}; -class String; - class ScAddInAsync : public SvtBroadcaster { private: union { double nVal; // current value - String* pStr; + OUString* pStr; }; ScAddInDocs* pDocs; // List of using documents FuncData* mpFuncData; // Pointer to data in collection @@ -61,7 +59,7 @@ public: bool IsValid() const { return bValid; } ParamType GetType() const { return meType; } double GetValue() const { return nVal; } - const String& GetString() const { return *pStr; } + const OUString& GetString() const { return *pStr; } bool HasDocument( ScDocument* pDoc ) const { return pDocs->find( pDoc ) != pDocs->end(); } void AddDocument( ScDocument* pDoc ) { pDocs->insert( pDoc ); } diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index e5f65fdf489f..76ec8dd2cbb9 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -98,11 +98,14 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData ) p->nVal = *(double*)pData; break; case PTR_STRING : + { + sal_Char* pChar = (sal_Char*)pData; if ( p->pStr ) - *p->pStr = String( (sal_Char*)pData, osl_getThreadTextEncoding() ); + *p->pStr = OUString( pChar, strlen(pChar),osl_getThreadTextEncoding() ); else - p->pStr = new String( (sal_Char*)pData, osl_getThreadTextEncoding() ); + p->pStr = new OUString( pChar, strlen(pChar), osl_getThreadTextEncoding() ); break; + } default : OSL_FAIL( "unknown AsyncType" ); return; |