Skip to content

C
core
Kaydet (Commit) b0be2055 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert sc/source/filter/inc/tokstack.hxx from String to OUString 

Change-Id: Ib23a94ee45539c01c3e4c95b3d5983c470950a8b
üst 127a09b3
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
sc/source/filter/excel/excform.cxx
Dosyayı görüntüle @ b0be2055
......@@ -1558,7 +1558,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz )
{
TokenId n = eParam[ nAnz - 1 ];
//##### GRUETZE FUER BASIC-FUNCS RICHTEN!
if( const String* pExt = aPool.GetExternal( n ) )
if( const OUString* pExt = aPool.GetExternal( n ) )
{
if( const XclFunctionInfo* pFuncInfo = maFuncProv.GetFuncInfoFromXclMacroName( *pExt ) )
aPool << pFuncInfo->meOpCode;
......
sc/source/filter/excel/tokstack.cxx
Dosyayı görüntüle @ b0be2055
......@@ -70,7 +70,7 @@ TokenPool::TokenPool( void )
// Sammelstelle fuer Strings
nP_Str = 4;
ppP_Str = new String *[ nP_Str ];
ppP_Str = new OUString *[ nP_Str ];
for( nLauf = 0 ; nLauf < nP_Str ; nLauf++ )
ppP_Str[ nLauf ] = NULL;
......@@ -169,7 +169,7 @@ bool TokenPool::GrowString( void )
sal_uInt16 nL;
String** ppP_StrNew = new (::std::nothrow) String *[ nP_StrNew ];
OUString** ppP_StrNew = new (::std::nothrow) OUString *[ nP_StrNew ];
if (!ppP_StrNew)
return false;
......@@ -392,7 +392,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
case T_Str:
{
sal_uInt16 n = pElement[ nId ];
String* p = ( n < nP_Str )? ppP_Str[ n ] : NULL;
OUString* p = ( n < nP_Str )? ppP_Str[ n ] : NULL;
if (p)
pScToken->AddString( *p );
else
......@@ -658,7 +658,7 @@ const TokenId TokenPool::Store( const sal_uInt16 nIndex )
}
const TokenId TokenPool::Store( const String& rString )
const TokenId TokenPool::Store( const OUString& rString )
{
// weitgehend nach Store( const sal_Char* ) kopiert, zur Vermeidung
// eines temporaeren Strings in "
......@@ -678,7 +678,7 @@ const TokenId TokenPool::Store( const String& rString )
// String anlegen
if( !ppP_Str[ nP_StrAkt ] )
//...aber nur, wenn noch nicht vorhanden
ppP_Str[ nP_StrAkt ] = new (::std::nothrow) String( rString );
ppP_Str[ nP_StrAkt ] = new (::std::nothrow) OUString( rString );
else
//...ansonsten nur kopieren
*ppP_Str[ nP_StrAkt ] = rString;
......@@ -686,7 +686,7 @@ const TokenId TokenPool::Store( const String& rString )
if (ppP_Str[ nP_StrAkt ])
{
DBG_ASSERT( sizeof( xub_StrLen ) <= 2, "*TokenPool::Store(): StrLen doesn't match!" );
pSize[ nElementAkt ] = ( sal_uInt16 ) ppP_Str[ nP_StrAkt ]->Len();
pSize[ nElementAkt ] = ( sal_uInt16 ) ppP_Str[ nP_StrAkt ]->getLength();
}
nElementAkt++;
......@@ -752,7 +752,7 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr )
}
const TokenId TokenPool::Store( const DefTokenId e, const String& r )
const TokenId TokenPool::Store( const DefTokenId e, const OUString& r )
{
if( nElementAkt >= nElement )
if (!GrowElement())
......@@ -850,7 +850,7 @@ const TokenId TokenPool::StoreName( sal_uInt16 nIndex, bool bGlobal )
return static_cast<const TokenId>(nElementAkt);
}
const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const String& rName )
const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const OUString& rName )
{
if ( nElementAkt >= nElement )
if (!GrowElement())
......@@ -869,7 +869,7 @@ const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const String& rName )
return static_cast<const TokenId>(nElementAkt);
}
const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef )
const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef )
{
if ( nElementAkt >= nElement )
if (!GrowElement())
......@@ -889,7 +889,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName
return static_cast<const TokenId>(nElementAkt);
}
const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef )
const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef )
{
if ( nElementAkt >= nElement )
if (!GrowElement())
......@@ -945,9 +945,9 @@ sal_Bool TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const
return false;
}
const String* TokenPool::GetExternal( const TokenId& rId ) const
const OUString* TokenPool::GetExternal( const TokenId& rId ) const
{
const String* p = NULL;
const OUString* p = NULL;
sal_uInt16 n = (sal_uInt16) rId;
if( n && n <= nElementAkt )
{
......
sc/source/filter/inc/tokstack.hxx
Dosyayı görüntüle @ b0be2055
......@@ -81,7 +81,7 @@ class TokenPool
// !ACHTUNG!: externe Id-Basis ist 1, interne 0!
// Ausgabe Id = 0 -> Fehlerfall
private:
String** ppP_Str; // Pool fuer Strings
OUString** ppP_Str; // Pool fuer Strings
sal_uInt16 nP_Str; // ...mit Groesse
sal_uInt16 nP_StrAkt; // ...und Schreibmarke
......@@ -105,8 +105,8 @@ class TokenPool
struct EXTCONT
{
DefTokenId eId;
String aText;
EXTCONT( const DefTokenId e, const String& r ) :
OUString aText;
EXTCONT( const DefTokenId e, const OUString& r ) :
eId( e ), aText( r ){}
};
EXTCONT** ppP_Ext;
......@@ -138,7 +138,7 @@ class TokenPool
struct ExtName
{
sal_uInt16 mnFileId;
String maName;
OUString maName;
};
::std::vector<ExtName> maExtNames;
......@@ -146,7 +146,7 @@ class TokenPool
struct ExtCellRef
{
sal_uInt16 mnFileId;
String maTabName;
OUString maTabName;
ScSingleRefData maRef;
};
::std::vector<ExtCellRef> maExtCellRefs;
......@@ -155,7 +155,7 @@ class TokenPool
struct ExtAreaRef
{
sal_uInt16 mnFileId;
String maTabName;
OUString maTabName;
ScComplexRefData maRef;
};
::std::vector<ExtAreaRef> maExtAreaRefs;
......@@ -200,25 +200,25 @@ class TokenPool
// nur fuer Range-Names
const TokenId Store( const sal_uInt16 nIndex );
inline const TokenId Store( const sal_Int16 nWert );
const TokenId Store( const String& rString );
const TokenId Store( const OUString& rString );
const TokenId Store( const ScSingleRefData& rTr );
const TokenId Store( const ScComplexRefData& rTr );
const TokenId Store( const DefTokenId eId, const String& rName );
const TokenId Store( const DefTokenId eId, const OUString& rName );
// 4 externals (e.g. AddIns, Makros...)
const TokenId StoreNlf( const ScSingleRefData& rTr );
const TokenId StoreMatrix();
const TokenId StoreName( sal_uInt16 nIndex, bool bGlobal );
const TokenId StoreExtName( sal_uInt16 nFileId, const String& rName );
const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef );
const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef );
const TokenId StoreExtName( sal_uInt16 nFileId, const OUString& rName );
const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef );
const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef );
inline const TokenId LastId( void ) const;
inline const ScTokenArray* operator []( const TokenId nId );
void Reset( void );
inline E_TYPE GetType( const TokenId& nId ) const;
sal_Bool IsSingleOp( const TokenId& nId, const DefTokenId eId ) const;
const String* GetExternal( const TokenId& nId ) const;
const OUString* GetExternal( const TokenId& nId ) const;
ScMatrix* GetMatrix( unsigned int n ) const;
};
......
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