Skip to content

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

convert sw/inc/IDocumentListsAccess.hxx from String to OUString 

and convert these methods parameter passing convention from
"const OUString" to the more normal "const OUString&"

Change-Id: I267b20f4c817f8353c8df9bbc0ca6cad3fcbfcaa
üst f400bc75
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 31 deletions
sw/inc/IDocumentListsAccess.hxx
Dosyayı görüntüle @ d036580f
......@@ -29,17 +29,17 @@ class SwList;
class IDocumentListsAccess
{
public:
virtual SwList* createList( String sListId,
const String sDefaultListStyleName ) = 0;
virtual void deleteList( const String sListId ) = 0;
virtual SwList* getListByName( const String sListId ) const = 0;
virtual SwList* createList( const OUString& rListId,
const OUString& rDefaultListStyleName ) = 0;
virtual void deleteList( const OUString& rListId ) = 0;
virtual SwList* getListByName( const OUString& rListId ) const = 0;
virtual SwList* createListForListStyle( const String sListStyleName ) = 0;
virtual SwList* getListForListStyle( const String sListStyleName ) const = 0;
virtual void deleteListForListStyle( const String sListStyleName ) = 0;
virtual SwList* createListForListStyle( const OUString& rListStyleName ) = 0;
virtual SwList* getListForListStyle( const OUString& rListStyleName ) const = 0;
virtual void deleteListForListStyle( const OUString& rListStyleName ) = 0;
// #i91400#
virtual void trackChangeOfListStyleName( const String sListStyleName,
const String sNewListStyleName ) = 0;
virtual void trackChangeOfListStyleName( const OUString& rListStyleName,
const OUString& rNewListStyleName ) = 0;
protected:
virtual ~IDocumentListsAccess() {};
};
......
sw/inc/doc.hxx
Dosyayı görüntüle @ d036580f
......@@ -996,15 +996,15 @@ public:
/** IDocumentListsAccess
*/
virtual SwList* createList( String sListId,
const String sDefaultListStyleName );
virtual void deleteList( const String sListId );
virtual SwList* getListByName( const String sListId ) const;
virtual SwList* createListForListStyle( const String sListStyleName );
virtual SwList* getListForListStyle( const String sListStyleName ) const;
virtual void deleteListForListStyle( const String sListStyleName );
virtual void trackChangeOfListStyleName( const String sListStyleName,
const String sNewListStyleName );
virtual SwList* createList( const OUString& rListId,
const OUString& rDefaultListStyleName );
virtual void deleteList( const OUString& rListId );
virtual SwList* getListByName( const OUString& rListId ) const;
virtual SwList* createListForListStyle( const OUString& rListStyleName );
virtual SwList* getListForListStyle( const OUString& rListStyleName ) const;
virtual void deleteListForListStyle( const OUString& rListStyleName );
virtual void trackChangeOfListStyleName( const OUString& rListStyleName,
const OUString& rNewListStyleName );
/** IDocumentExternalData */
virtual void setExternalData(::sw::tExternalDataType eType,
......
sw/source/core/attr/swatrset.cxx
Dosyayı görüntüle @ d036580f
......@@ -258,9 +258,9 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
pCNd && pCNd->IsTxtNode() &&
GetItemState( RES_PARATR_LIST_ID, sal_False, &pItem ) == SFX_ITEM_SET )
{
const String& sListId =
const OUString& sListId =
dynamic_cast<const SfxStringItem*>(pItem)->GetValue();
if ( sListId.Len() > 0 &&
if ( !sListId.isEmpty() &&
!pDstDoc->getListByName( sListId ) )
{
const SwList* pList = pSrcDoc->getListByName( sListId );
......
sw/source/core/doc/docnum.cxx
Dosyayı görüntüle @ d036580f
......@@ -2452,10 +2452,11 @@ void SwDoc::getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOu
}
// implementation of interface IDocumentListsAccess
SwList* SwDoc::createList( String sListId,
const String sDefaultListStyleName )
SwList* SwDoc::createList( const OUString& rListId,
const OUString& sDefaultListStyleName )
{
if ( sListId.Len() == 0 )
OUString sListId = rListId;
if ( sListId.isEmpty() )
{
sListId = listfunc::CreateUniqueListId( *this );
}
......@@ -2479,7 +2480,7 @@ SwList* SwDoc::createList( String sListId,
return pNewList;
}
void SwDoc::deleteList( const String sListId )
void SwDoc::deleteList( const OUString& sListId )
{
SwList* pList = getListByName( sListId );
if ( pList )
......@@ -2489,7 +2490,7 @@ void SwDoc::deleteList( const String sListId )
}
}
SwList* SwDoc::getListByName( const String sListId ) const
SwList* SwDoc::getListByName( const OUString& sListId ) const
{
SwList* pList = 0;
......@@ -2503,9 +2504,9 @@ SwList* SwDoc::getListByName( const String sListId ) const
return pList;
}
SwList* SwDoc::createListForListStyle( const String sListStyleName )
SwList* SwDoc::createListForListStyle( const OUString& sListStyleName )
{
if ( sListStyleName.Len() == 0 )
if ( sListStyleName.isEmpty() )
{
OSL_FAIL( "<SwDoc::createListForListStyle(..)> - no list style name provided. Serious defect -> please inform OD." );
return 0;
......@@ -2536,7 +2537,7 @@ SwList* SwDoc::createListForListStyle( const String sListStyleName )
return pNewList;
}
SwList* SwDoc::getListForListStyle( const String sListStyleName ) const
SwList* SwDoc::getListForListStyle( const OUString& sListStyleName ) const
{
SwList* pList = 0;
......@@ -2550,7 +2551,7 @@ SwList* SwDoc::getListForListStyle( const String sListStyleName ) const
return pList;
}
void SwDoc::deleteListForListStyle( const String sListStyleName )
void SwDoc::deleteListForListStyle( const OUString& sListStyleName )
{
String sListId;
{
......@@ -2569,8 +2570,8 @@ void SwDoc::deleteListForListStyle( const String sListStyleName )
}
}
void SwDoc::trackChangeOfListStyleName( const String sListStyleName,
const String sNewListStyleName )
void SwDoc::trackChangeOfListStyleName( const OUString& sListStyleName,
const OUString& sNewListStyleName )
{
SwList* pList = getListForListStyle( sListStyleName );
OSL_ENSURE( pList,
......
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