Skip to content

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

convert sc/.../inc/tpusrlst.hxx from String to OUString 

Change-Id: If41743507a227618989bf7fba5c6fa443fd9c82e
üst de714cbb
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
sc/source/ui/inc/tpusrlst.hxx
Dosyayı görüntüle @ 3a30d789
...@@ -65,10 +65,10 @@ private: ...@@ -65,10 +65,10 @@ private:
PushButton* mpBtnCopy; PushButton* mpBtnCopy;
const String aStrQueryRemove; const OUString aStrQueryRemove;
const String aStrCopyList; const OUString aStrCopyList;
const String aStrCopyFrom; const OUString aStrCopyFrom;
const String aStrCopyErr; const OUString aStrCopyErr;
const sal_uInt16 nWhichUserLists; const sal_uInt16 nWhichUserLists;
ScUserList* pUserLists; ScUserList* pUserLists;
...@@ -76,7 +76,7 @@ private: ...@@ -76,7 +76,7 @@ private:
ScDocument* pDoc; ScDocument* pDoc;
ScViewData* pViewData; ScViewData* pViewData;
ScRangeUtil* pRangeUtil; ScRangeUtil* pRangeUtil;
String aStrSelectedArea; OUString aStrSelectedArea;
sal_Bool bModifyMode; sal_Bool bModifyMode;
sal_Bool bCancelMode; sal_Bool bCancelMode;
...@@ -88,11 +88,11 @@ private: ...@@ -88,11 +88,11 @@ private:
void Init (); void Init ();
sal_uInt16 UpdateUserListBox (); sal_uInt16 UpdateUserListBox ();
void UpdateEntries ( size_t nList ); void UpdateEntries ( size_t nList );
void MakeListStr ( String& rListStr ); void MakeListStr ( OUString& rListStr );
void AddNewList ( const String& rEntriesStr ); void AddNewList ( const OUString& rEntriesStr );
void RemoveList ( size_t nList ); void RemoveList ( size_t nList );
void ModifyList ( sal_uInt16 nSelList, void ModifyList ( sal_uInt16 nSelList,
const String& rEntriesStr ); const OUString& rEntriesStr );
void CopyListFromArea ( const ScRefAddress& rStartPos, void CopyListFromArea ( const ScRefAddress& rStartPos,
const ScRefAddress& rEndPos ); const ScRefAddress& rEndPos );
......
sc/source/ui/optdlg/tpusrlst.cxx
Dosyayı görüntüle @ 3a30d789
...@@ -310,7 +310,7 @@ void ScTpUserLists::UpdateEntries( size_t nList ) ...@@ -310,7 +310,7 @@ void ScTpUserLists::UpdateEntries( size_t nList )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ScTpUserLists::MakeListStr( String& rListStr ) void ScTpUserLists::MakeListStr( OUString& rListStr )
{ {
String aStr; String aStr;
...@@ -318,7 +318,7 @@ void ScTpUserLists::MakeListStr( String& rListStr ) ...@@ -318,7 +318,7 @@ void ScTpUserLists::MakeListStr( String& rListStr )
for(xub_StrLen i=0;i<nToken;i++) for(xub_StrLen i=0;i<nToken;i++)
{ {
OUString aString = comphelper::string::strip(rListStr.GetToken(i, LF), ' '); OUString aString = comphelper::string::strip(rListStr.getToken(i, LF), ' ');
aStr+=aString; aStr+=aString;
aStr+=cDelimiter; aStr+=cDelimiter;
} }
...@@ -326,18 +326,18 @@ void ScTpUserLists::MakeListStr( String& rListStr ) ...@@ -326,18 +326,18 @@ void ScTpUserLists::MakeListStr( String& rListStr )
aStr = comphelper::string::strip(aStr, cDelimiter); aStr = comphelper::string::strip(aStr, cDelimiter);
xub_StrLen nLen = aStr.Len(); xub_StrLen nLen = aStr.Len();
rListStr.Erase(); rListStr = "";
// Alle Doppelten cDelimiter entfernen: // Alle Doppelten cDelimiter entfernen:
xub_StrLen c = 0; xub_StrLen c = 0;
while ( c < nLen ) while ( c < nLen )
{ {
rListStr += aStr.GetChar(c); rListStr += OUString(aStr.GetChar(c));
c++; c++;
if ( aStr.GetChar(c) == cDelimiter ) if ( aStr.GetChar(c) == cDelimiter )
{ {
rListStr += aStr.GetChar(c); rListStr += OUString(aStr.GetChar(c));
while ( (aStr.GetChar(c) == cDelimiter) && (c < nLen) ) while ( (aStr.GetChar(c) == cDelimiter) && (c < nLen) )
c++; c++;
...@@ -348,9 +348,9 @@ void ScTpUserLists::MakeListStr( String& rListStr ) ...@@ -348,9 +348,9 @@ void ScTpUserLists::MakeListStr( String& rListStr )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ScTpUserLists::AddNewList( const String& rEntriesStr ) void ScTpUserLists::AddNewList( const OUString& rEntriesStr )
{ {
String theEntriesStr( rEntriesStr ); OUString theEntriesStr( rEntriesStr );
if ( !pUserLists ) if ( !pUserLists )
pUserLists = new ScUserList; pUserLists = new ScUserList;
...@@ -455,13 +455,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, ...@@ -455,13 +455,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ScTpUserLists::ModifyList( sal_uInt16 nSelList, void ScTpUserLists::ModifyList( sal_uInt16 nSelList,
const String& rEntriesStr ) const OUString& rEntriesStr )
{ {
if ( !pUserLists ) return; if ( !pUserLists ) return;
//---------------------------------------------------------- //----------------------------------------------------------
String theEntriesStr( rEntriesStr ); OUString theEntriesStr( rEntriesStr );
MakeListStr( theEntriesStr ); MakeListStr( theEntriesStr );
...@@ -646,10 +646,10 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) ...@@ -646,10 +646,10 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
if ( mpLbLists->GetEntryCount() > 0 ) if ( mpLbLists->GetEntryCount() > 0 )
{ {
sal_uInt16 nRemovePos = mpLbLists->GetSelectEntryPos(); sal_uInt16 nRemovePos = mpLbLists->GetSelectEntryPos();
String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) ); String aMsg ( aStrQueryRemove.getToken( 0, '#' ) );
aMsg += mpLbLists->GetEntry( nRemovePos ); aMsg += mpLbLists->GetEntry( nRemovePos );
aMsg += aStrQueryRemove.GetToken( 1, '#' ); aMsg += aStrQueryRemove.getToken( 1, '#' );
if ( RET_YES == QueryBox( this, if ( RET_YES == QueryBox( this,
......
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