[PATCH] String=>OUString in svl
Norbert Thiebaud (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Jun 13 06:19:22 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4251
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/4251/1
String=>OUString in svl
Change-Id: Ie1cc02f168f5977b953fc13590da17f8b12513f6
---
M cui/source/inc/page.hxx
M cui/source/tabpages/numpages.cxx
M cui/source/tabpages/page.cxx
M include/svl/inethist.hxx
M include/svl/sfontitm.hxx
M include/svl/slstitm.hxx
M include/svl/srchitem.hxx
M sc/source/core/data/table6.cxx
M sc/source/ui/inc/navipi.hxx
M sc/source/ui/navipi/scenwnd.cxx
M sc/source/ui/view/cellsh.cxx
M sc/source/ui/view/tabvwshb.cxx
M sd/source/ui/view/viewshel.cxx
M sfx2/source/appl/appcfg.cxx
M svl/source/items/imageitm.cxx
M svl/source/items/macitem.cxx
M svl/source/items/slstitm.cxx
M svx/source/dialog/srchdlg.cxx
M svx/source/gallery2/galbrws2.cxx
M svx/source/tbxctrls/lboxctrl.cxx
M sw/source/ui/fmtui/tmpdlg.cxx
M sw/source/ui/misc/num.cxx
M sw/source/ui/shells/basesh.cxx
M sw/source/ui/uiview/viewsrch.cxx
24 files changed, 78 insertions(+), 77 deletions(-)
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index b61c47a..7c21e17 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -193,7 +193,7 @@
void SetPaperFormatRanges( Paper eStart, Paper eEnd )
{ ePaperStart = eStart, ePaperEnd = eEnd; }
- void SetCollectionList(const std::vector<String> &aList);
+ void SetCollectionList(const std::vector<OUString> &aList);
virtual void PageCreated (SfxAllItemSet aSet);
};
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index bf3ba14..0dc32be 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3524,7 +3524,7 @@
if (pListItem)
{
ListBox& myCharFmtLB = GetCharFmtListBox();
- const std::vector<String> &aList = (pListItem)->GetList();
+ const std::vector<OUString> &aList = (pListItem)->GetList();
sal_uInt32 nCount = aList.size();;
for(sal_uInt32 i = 0; i < nCount; i++)
myCharFmtLB.InsertEntry(aList[i]);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index da2ac1c..2ca7a95 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1562,7 +1562,7 @@
// -----------------------------------------------------------------------
-void SvxPageDescPage::SetCollectionList(const std::vector<String> &aList)
+void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
{
OSL_ENSURE(!aList.empty(), "Empty string list");
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 4ee592f..bdf6926 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -21,7 +21,6 @@
#include "svl/svldllapi.h"
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <svl/brdcst.hxx>
#include <svl/hint.hxx>
@@ -86,7 +85,7 @@
return sal_False;
}
- sal_Bool QueryUrl (const String &rUrl)
+ sal_Bool QueryUrl (const OUString &rUrl)
{
INetProtocol eProto =
INetURLObject::CompareProtocolScheme (rUrl);
@@ -104,7 +103,7 @@
PutUrl_Impl (rUrl);
}
- void PutUrl (const String &rUrl)
+ void PutUrl (const OUString &rUrl)
{
INetProtocol eProto =
INetURLObject::CompareProtocolScheme (rUrl);
diff --git a/include/svl/sfontitm.hxx b/include/svl/sfontitm.hxx
index f9bcbdc..188f079 100644
--- a/include/svl/sfontitm.hxx
+++ b/include/svl/sfontitm.hxx
@@ -28,8 +28,8 @@
//============================================================================
class SfxFontItem: public SfxPoolItem
{
- XubString m_aName;
- XubString m_aStyleName;
+ OUString m_aName;
+ OUString m_aStyleName;
Size m_aSize;
Color m_aColor;
Color m_aFillColor;
@@ -68,8 +68,8 @@
sal_Bool hasColor() const { return m_bHasColor; }
sal_Bool hasFillColor() const { return m_bHasFillColor; }
- const XubString & getName() const { return m_aName; }
- const XubString & getStyleName() const { return m_aStyleName; }
+ const OUString & getName() const { return m_aName; }
+ const OUString & getStyleName() const { return m_aStyleName; }
const Size & getSize() const { return m_aSize; }
const Color & getColor() const { return m_aColor; }
@@ -92,8 +92,8 @@
sal_Bool getShadow() const { return m_bShadow; }
sal_Bool getKerning() const { return m_bKerning; }
- inline void setFont(sal_Int16 nTheFamily, const XubString & rTheName,
- const XubString & rTheStyleName, sal_Int16 nThePitch,
+ inline void setFont(sal_Int16 nTheFamily, const OUString & rTheName,
+ const OUString & rTheStyleName, sal_Int16 nThePitch,
rtl_TextEncoding nTheCharSet);
inline void setWeight(sal_Int16 nTheWeight);
inline void setItalic(sal_Int16 nTheItalic);
@@ -129,8 +129,8 @@
{}
inline void SfxFontItem::setFont(sal_Int16 nTheFamily,
- const XubString & rTheName,
- const XubString & rTheStyleName,
+ const OUString & rTheName,
+ const OUString & rTheStyleName,
sal_Int16 nThePitch,
rtl_TextEncoding nTheCharSet)
{
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 90c8731..91a5843 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -37,18 +37,18 @@
TYPEINFO();
SfxStringListItem();
- SfxStringListItem( sal_uInt16 nWhich, const std::vector<String> *pList=NULL );
+ SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=NULL );
SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream );
SfxStringListItem( const SfxStringListItem& rItem );
~SfxStringListItem();
- std::vector<String>& GetList();
+ std::vector<OUString>& GetList();
- const std::vector<String>& GetList() const;
+ const std::vector<OUString>& GetList() const;
// String-Separator: \n
- virtual void SetString( const XubString& );
- virtual XubString GetString();
+ virtual void SetString( const OUString& );
+ virtual OUString GetString();
void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 5d4413e..b4ca9b7 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -98,11 +98,11 @@
sal_uInt16 GetCommand() const { return nCommand; }
void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
- inline const String GetSearchString() const;
- inline void SetSearchString(const String& rNewString);
+ inline const OUString GetSearchString() const;
+ inline void SetSearchString(const OUString& rNewString);
- inline const String GetReplaceString() const;
- inline void SetReplaceString(const String& rNewString);
+ inline const OUString GetReplaceString() const;
+ inline void SetReplaceString(const OUString& rNewString);
inline bool GetWordOnly() const;
void SetWordOnly(bool bNewWordOnly);
@@ -176,22 +176,22 @@
inline void SetUseAsianOptions( bool bVal ) { bAsianOptions = bVal; }
};
-const String SvxSearchItem::GetSearchString() const
+const OUString SvxSearchItem::GetSearchString() const
{
return aSearchOpt.searchString;
}
-void SvxSearchItem::SetSearchString(const String& rNewString)
+void SvxSearchItem::SetSearchString(const OUString& rNewString)
{
aSearchOpt.searchString = rNewString;
}
-const String SvxSearchItem::GetReplaceString() const
+const OUString SvxSearchItem::GetReplaceString() const
{
return aSearchOpt.replaceString;
}
-void SvxSearchItem::SetReplaceString(const String& rNewString)
+void SvxSearchItem::SetReplaceString(const OUString& rNewString)
{
aSearchOpt.replaceString = rNewString;
}
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index e2a3bcb..a05edc8 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -823,7 +823,7 @@
rCol = nCol;
rRow = nRow;
if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
- rSearchItem.GetReplaceString().Len())
+ !rSearchItem.GetReplaceString().isEmpty())
{
rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
rUndoStr = OUString();
@@ -951,7 +951,7 @@
{
bool bFound = false;
bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) &&
- (rSearchItem.GetReplaceString().Len() > 0);
+ (!rSearchItem.GetReplaceString().isEmpty());
bool bSkipFiltered = rSearchItem.IsSearchFiltered();
for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index c62f534..8e8f8ac 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -63,7 +63,7 @@
explicit ScScenarioListBox( ScScenarioWindow& rParent );
virtual ~ScScenarioListBox();
- void UpdateEntries( const std::vector<String> &aNewEntryList );
+ void UpdateEntries( const std::vector<OUString> &aNewEntryList );
protected:
virtual void Select();
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 4ecce70..a65be54 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -48,7 +48,7 @@
{
}
-void ScScenarioListBox::UpdateEntries( const std::vector<String> &aNewEntryList )
+void ScScenarioListBox::UpdateEntries( const std::vector<OUString> &aNewEntryList )
{
Clear();
maEntries.clear();
@@ -71,7 +71,7 @@
OSL_ENSURE( aNewEntryList.size() % 3 == 0, "ScScenarioListBox::UpdateEntries - wrong list size" );
SetUpdateMode( false );
- std::vector<String>::const_iterator iter;
+ std::vector<OUString>::const_iterator iter;
for (iter = aNewEntryList.begin(); iter != aNewEntryList.end(); ++iter)
{
ScenarioEntry aEntry;
@@ -85,7 +85,7 @@
// third entry of a triple is the protection ("0" = not protected, "1" = protected)
++iter;
- aEntry.mbProtected = (iter->Len() > 0) && (iter->GetChar( 0 ) != '0');
+ aEntry.mbProtected = (iter->getLength() > 0) && (iter[ 0 ] != '0');
maEntries.push_back( aEntry );
InsertEntry( aEntry.maName, LISTBOX_APPEND );
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 0685677..b7c09e7 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -762,7 +762,7 @@
case SID_SELECT_SCENARIO:
{
- std::vector<String> aList;
+ std::vector<OUString> aList;
Color aDummyCol;
if ( !pDoc->IsScenario(nTab) )
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 2b31d63..025f635 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -560,7 +560,7 @@
SfxStringListItem aStrLst( nWhich );
if ( pUndoManager )
{
- std::vector<String> &aList = aStrLst.GetList();
+ std::vector<OUString> &aList = aStrLst.GetList();
sal_Bool bIsUndo = ( nWhich == SID_GETUNDOSTRINGS );
size_t nCount = bIsUndo ? pUndoManager->GetUndoActionCount() : pUndoManager->GetRedoActionCount();
for (size_t i=0; i<nCount; ++i)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index b60d6ff..88d90b7 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1097,7 +1097,7 @@
if(nCount)
{
// prepare list
- ::std::vector< String > aStringList;
+ ::std::vector< OUString > aStringList;
for (sal_uInt16 a = 0; a < nCount; ++a)
{
@@ -1126,7 +1126,7 @@
if(nCount)
{
// prepare list
- ::std::vector< String > aStringList;
+ ::std::vector< OUString > aStringList;
sal_uInt16 a;
for( a = 0; a < nCount; a++)
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 8b0022a..7766b81 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -366,7 +366,7 @@
if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS))
{
::com::sun::star::uno::Sequence< OUString > seqURLs = aSecurityOptions.GetSecureURLs();
- std::vector<String> aList;
+ std::vector<OUString> aList;
sal_uInt32 nCount = seqURLs.getLength();
sal_uInt32 nURL;
for( nURL=0; nURL<nCount; ++nURL )
@@ -757,7 +757,7 @@
if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected");
- const std::vector<String> &aList = ((SfxStringListItem*)pItem)->GetList();
+ const std::vector<OUString> &aList = ((SfxStringListItem*)pItem)->GetList();
sal_uInt32 nCount = aList.size();
::com::sun::star::uno::Sequence< OUString > seqURLs(nCount);
for( sal_uInt32 nPosition=0;nPosition<nCount;++nPosition)
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 9a12775..bc96af4 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -25,7 +25,7 @@
struct SfxImageItem_Impl
{
- String aURL;
+ OUString aURL;
long nAngle;
bool bMirrored;
int operator == ( const SfxImageItem_Impl& rOther ) const
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index cd812c6..5484f5f2 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -131,7 +131,7 @@
for( short i = 0; i < nMacro; ++i )
{
sal_uInt16 nCurKey, eType = STARBASIC;
- String aLibName, aMacName;
+ OUString aLibName, aMacName;
rStrm >> nCurKey;
aLibName = SfxPoolItem::readByteString(rStrm);
aMacName = SfxPoolItem::readByteString(rStrm);
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 88abad2..1671e59 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -36,7 +36,7 @@
{
public:
sal_uInt16 nRefCount;
- std::vector<String> aList;
+ std::vector<OUString> aList;
SfxImpStringList() { nRefCount = 1; }
~SfxImpStringList();
@@ -59,7 +59,7 @@
//------------------------------------------------------------------------
-SfxStringListItem::SfxStringListItem( sal_uInt16 which, const std::vector<String>* pList ) :
+SfxStringListItem::SfxStringListItem( sal_uInt16 which, const std::vector<OUString>* pList ) :
SfxPoolItem( which ),
pImp(NULL)
{
@@ -90,7 +90,7 @@
if (pImp)
{
long i;
- String aStr;
+ OUString aStr;
for( i=0; i < nEntryCount; i++ )
{
aStr = readByteString(rStream);
@@ -128,7 +128,7 @@
//------------------------------------------------------------------------
-std::vector<String>& SfxStringListItem::GetList()
+std::vector<OUString>& SfxStringListItem::GetList()
{
if( !pImp )
pImp = new SfxImpStringList;
@@ -136,7 +136,7 @@
return pImp->aList;
}
-const std::vector<String>& SfxStringListItem::GetList () const
+const std::vector<OUString>& SfxStringListItem::GetList () const
{
return (const_cast< SfxStringListItem * >(this))->GetList();
}
@@ -212,7 +212,7 @@
//------------------------------------------------------------------------
-void SfxStringListItem::SetString( const XubString& rStr )
+void SfxStringListItem::SetString( const OUString& rStr )
{
DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0");
@@ -222,46 +222,48 @@
pImp->nRefCount--;
pImp = new SfxImpStringList;
- xub_StrLen nStart = 0;
- xub_StrLen nDelimPos;
- XubString aStr(convertLineEnd(rStr, LINEEND_CR));
- do
+ sal_Int32 nStart = 0;
+ sal_Int32 nDelimPos;
+ OUString aStr(convertLineEnd(rStr, LINEEND_CR));
+ for(;;)
{
- nDelimPos = aStr.Search( '\r', nStart );
- xub_StrLen nLen;
- if ( nDelimPos == STRING_NOTFOUND )
- nLen = 0xffff;
+ nDelimPos = aStr.indexOf( '\r', nStart );
+ if ( nDelimPos < 0)
+ {
+ pImp->aList.push_back(aStr.copy(nStart));
+ break;
+ }
else
- nLen = nDelimPos - nStart;
-
+ {
+ pImp->aList.push_back(aStr.copy(nStart, nDelimPos - nStart));
+ }
// String gehoert der Liste
- pImp->aList.push_back(aStr.Copy(nStart, nLen));
- nStart += nLen + 1 ; // delimiter ueberspringen
- } while( nDelimPos != STRING_NOTFOUND );
+ nStart = nDelimPos + 1;
+ }
// Kein Leerstring am Ende
- if (!pImp->aList.empty() && !(pImp->aList.rbegin())->Len())
+ if (!pImp->aList.empty() && (pImp->aList.rbegin())->isEmpty())
pImp->aList.pop_back();
}
//------------------------------------------------------------------------
-XubString SfxStringListItem::GetString()
+OUString SfxStringListItem::GetString()
{
- XubString aStr;
+ OUString aStr;
if ( pImp )
{
DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid");
- std::vector<String>::iterator iter;
+ std::vector<OUString>::iterator iter;
for (iter = pImp->aList.begin();;)
{
aStr += *iter;
++iter;
if (iter != pImp->aList.end())
- aStr += '\r';
+ aStr += "\r";
else
break;
}
@@ -285,7 +287,7 @@
{
// String gehoert der Liste
for ( sal_Int32 n = 0; n < rList.getLength(); n++ )
- pImp->aList.push_back(XubString(rList[n]));
+ pImp->aList.push_back(OUString(rList[n]));
}
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 157af30..8a41659 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -137,7 +137,7 @@
if (pSrchItem)
{
- std::vector<String> aLst = pSrchItem->GetList();
+ std::vector<OUString> aLst = pSrchItem->GetList();
for ( sal_uInt16 i = 0; i < aLst.size(); ++i )
{
@@ -150,7 +150,7 @@
void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst )
{
DBG_ASSERT( !rStrLst.empty(), "check in advance");
- std::vector<String> aLst;
+ std::vector<OUString> aLst;
for (std::vector<OUString>::const_iterator i = rStrLst.begin(); i != rStrLst.end(); ++i)
aLst.push_back(String(*i));
@@ -922,7 +922,7 @@
bool bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 );
bool bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 );
- if ( pSearchItem->GetSearchString().Len() && bSetSearch )
+ if ( !pSearchItem->GetSearchString().isEmpty() && bSetSearch )
m_pSearchLB->SetText( pSearchItem->GetSearchString() );
else if (!aSearchStrings.empty())
{
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index baba409..7ca1a74 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -96,7 +96,7 @@
if ( ( pStrLstItem = PTR_CAST( SfxStringListItem, pItem ) ) != NULL )
{
- const std::vector<String> &aList = pStrLstItem->GetList();
+ const std::vector<OUString> &aList = pStrLstItem->GetList();
for ( sal_uIntPtr i = 0, nCount = aList.size(); i < nCount; i++ )
InsertItem( (sal_uInt16) i + 1, aList[i]);
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index ab150fa..6c8915e 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -282,7 +282,7 @@
{
SfxStringListItem &rItem = *(SfxStringListItem *)pState;
- const std::vector<String> &aLst = rItem.GetList();
+ const std::vector<OUString> &aLst = rItem.GetList();
for( long nI = 0, nEnd = aLst.size(); nI < nEnd; ++nI )
aUndoRedoList.push_back( OUString( aLst[nI] ));
}
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 8944b2a3..a6277f9 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -476,7 +476,7 @@
case TP_PAGE_STD:
if(0 == (nHtmlMode & HTMLMODE_ON ))
{
- std::vector<String> aList;
+ std::vector<OUString> aList;
String aNew;
SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, aNew );
aList.push_back( aNew );
@@ -526,7 +526,7 @@
SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell();
::FillCharStyleListBox(rCharFmtLB, pDocShell);
- std::vector<String> aList;
+ std::vector<OUString> aList;
for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++)
aList.push_back( rCharFmtLB.GetEntry(j) );
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 02335fd..7efa440 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -967,7 +967,7 @@
SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
::FillCharStyleListBox(rCharFmtLB, pDocShell);
- std::vector<String> aList;
+ std::vector<OUString> aList;
for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++)
aList.push_back( String(rCharFmtLB.GetEntry(j)));
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 05ce67d..dc54ec3 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2652,7 +2652,7 @@
{
int nSel = rSh.GetSelectionType();
SfxStringListItem aLst( nWhich );
- std::vector<String> &rLst = aLst.GetList();
+ std::vector<OUString> &rLst = aLst.GetList();
nParagraphPos = nGraphicPos = nOlePos = nFramePos = nTablePos =
nTableRowPos = nTableCellPos = nPagePos =
nHeaderPos = nFooterPos = 0;
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 7e07a36..3df85c96 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -243,7 +243,7 @@
// was ist, wenn man das gefundene nur attributieren will??
sal_uInt16 nCmd = SVX_SEARCHCMD_FIND;
- if( m_pSrchItem->GetReplaceString().Len() ||
+ if( !m_pSrchItem->GetReplaceString().isEmpty() ||
!m_pReplList )
{
// Verhindern, dass - falls der Suchstring im
@@ -751,7 +751,7 @@
rOptions.eStart,
rOptions.eEnd,
FindRanges(eRanges),
- m_pSrchItem->GetSearchString().Len() ? &aSearchOpt : 0,
+ !m_pSrchItem->GetSearchString().isEmpty() ? &aSearchOpt : 0,
pReplSet );
}
else if( m_pSrchItem->GetPattern() )
--
To view, visit https://gerrit.libreoffice.org/4251
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1cc02f168f5977b953fc13590da17f8b12513f6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud at gmail.com>
More information about the LibreOffice
mailing list