[Libreoffice-commits] core.git: editeng/source lotuswordpro/source vcl/source

[Stephan Bergmann]

 editeng/source/uno/unotext.cxx                   |    2 +-
 lotuswordpro/source/filter/lwpbulletstylemgr.cxx |    6 +++---
 lotuswordpro/source/filter/lwpsilverbullet.cxx   |   12 ++++++------
 vcl/source/window/toolbox2.cxx                   |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 8be00a3f757618b98d2407978eec2b8526e33232
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 27 08:29:10 2015 +0200

    Help GCC
    
    Change-Id: Ibeace7ce7621033cf04e3186c212bbb4a27492a1

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index b008c43..87b48a4 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -377,7 +377,7 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString()
     }
     else
     {
-        return "";
+        return OUString();
     }
 }
 
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 34f9c56..c77114f 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -102,21 +102,21 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
 {
     if(!pPara || !pIndent || !pBullOver)
     {
-        return "";
+        return OUString();
     }
 
     LwpSilverBullet* pSilverBullet = pPara->GetSilverBullet();
     if (!pSilverBullet)
     {
         assert(false);
-        return "";
+        return OUString();
     }
 
     LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
     if (!pBulletPara)
     {
         assert(false);
-        return "";
+        return OUString();
     }
 
     LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index a695c90..3ccf51e 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -192,7 +192,7 @@ OUString LwpSilverBullet::GetBulletFontName()
     //foundry has been set?
     if (!m_pFoundry)
     {
-        return "";
+        return OUString();
     }
 
     LwpFontManager& rFontMgr = m_pFoundry->GetFontManger();
@@ -203,7 +203,7 @@ OUString LwpSilverBullet::GetBulletFontName()
     //final fontid is valid?
     if (nFinalFont > 255 || nFinalFont == 0)
     {
-        return "";
+        return OUString();
     }
 
     //get font name from font manager.
@@ -252,7 +252,7 @@ OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
     if (!pParaNumber)
     {
         assert(false);
-        return "";
+        return OUString();
     }
 
     OUString strNumChar("1");
@@ -363,7 +363,7 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
     LwpFrib* pParaFrib = m_pBulletPara->GetFribs().GetFribs();
     if (!pParaFrib)
     {
-        return "";
+        return OUString();
     }
 
     while (pParaFrib)
@@ -373,7 +373,7 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
             ModifierInfo* pMoInfo = pParaFrib->GetModifiers();
             if (!pMoInfo)
             {
-                return "";
+                return OUString();
             }
             sal_uInt16 nHideLevels = pMoInfo->aTxtAttrOverride.GetHideLevels();
             sal_uInt16 nType = static_cast<LwpFribDocVar*>(pParaFrib)->GetType();
@@ -434,7 +434,7 @@ OUString LwpSilverBullet::GetSectionName()
     LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY).get());
     if (!pStory)
     {
-        return "";
+        return OUString();
     }
 
     return pStory->GetSectionName();
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 0d48a67..19ca6dc 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1584,7 +1584,7 @@ OUString ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const
     if ( pItem )
         return pItem->maQuickHelpText;
     else
-        return "";
+        return OUString();
 }
 
 void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText )