summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-12-15 15:42:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-12-17 09:35:24 +0000
commit2be589381e8e8969764e0de1ad079fca959afb8a (patch)
tree77d4b80b56cb00fc1863391e12407ac2b24b7c4d /sw
parentfd84daf696a368c2c7561b5253b32a63ecdeca4a (diff)
remove rather pointless uses of aEmptyStr
Change-Id: I66fdf76c9e6aceca594bac6e1007676250ac7301
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/portxt.cxx6
-rw-r--r--sw/source/core/txtnode/fntcache.cxx6
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/ui/utlui/gloslst.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index d2140b64b0de..dffcfa49e97c 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -188,7 +188,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr
bool bOldOnWin = rInf.OnWin();
((SwTxtSizeInfo &)rInf).SetOnWin( false );
- XubString aStr( aEmptyStr );
+ XubString aStr;
pPor->GetExpTxt( rInf, aStr );
((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
@@ -616,7 +616,7 @@ xub_StrLen SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf,
bool bOldOnWin = rInf.OnWin();
((SwTxtSizeInfo &)rInf).SetOnWin( false );
- XubString aStr( aEmptyStr );
+ XubString aStr;
GetExpTxt( rInf, aStr );
((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
@@ -646,7 +646,7 @@ long SwTxtPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) cons
bool bOldOnWin = rInf.OnWin();
((SwTxtSizeInfo &)rInf).SetOnWin( false );
- XubString aStr( aEmptyStr );
+ XubString aStr;
GetExpTxt( rInf, aStr );
((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
if( nSpaceAdd > 0 )
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 3eba96d4bd83..14f7485c161f 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -71,9 +71,9 @@ sal_uInt16 GetDefaultFontHeight( SwDrawTextInfo &rInf )
SwDocShell* pDocShell = rInf.GetShell()->GetDoc()->GetDocShell();
SfxStyleSheetBasePool* pBasePool = pDocShell->GetStyleSheetPool();
- String aString(SW_RES(STR_POOLCOLL_STANDARD));
+ OUString sString(SW_RESSTR(STR_POOLCOLL_STANDARD));
- SfxStyleSheetBase* pStyle = pBasePool->Find( aString, (SfxStyleFamily)SFX_STYLE_FAMILY_PARA );
+ SfxStyleSheetBase* pStyle = pBasePool->Find(sString, (SfxStyleFamily)SFX_STYLE_FAMILY_PARA);
SfxItemSet& aTmpSet = pStyle->GetItemSet();
SvxFontHeightItem &aDefaultFontItem = (SvxFontHeightItem&)aTmpSet.Get(RES_CHRATR_CJK_FONTSIZE);
return (sal_uInt16)aDefaultFontItem.GetHeight();
@@ -1410,7 +1410,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
else
{
const String* pStr = &rInf.GetText();
- String aStr( aEmptyStr );
+ String aStr;
sal_Bool bBullet = rInf.GetBullet();
if( bSymbol )
bBullet = sal_False;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 8509ff88724a..3b39dcc56be1 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -4560,7 +4560,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage
SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs
sal_uInt16 nTopColl = pContext ? pContext->GetTxtFmtColl() : 0;
- const String& rTopClass = pContext ? pContext->GetClass() : (const String&) aEmptyStr;
+ const String& rTopClass = pContext ? pContext->GetClass() : aEmptyStr;
sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT;
sal_Bool bInPRE=sal_False; // etwas Kontext Info
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index a89a06d76250..2a306b655dff 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -189,7 +189,7 @@ sal_uInt16 SwGlossaryList::GetGroupCount()
String SwGlossaryList::GetGroupName(sal_uInt16 nPos, sal_Bool bNoPath, String* pTitle)
{
OSL_ENSURE(aGroupArr.size() > nPos, "group not available");
- String sRet(aEmptyStr);
+ String sRet;
if(nPos < aGroupArr.size())
{
AutoTextGroup* pGroup = aGroupArr[nPos];