[Libreoffice-commits] core.git: svx/source

Stephan Bergmann sbergman at redhat.com
Sun Sep 20 11:55:20 PDT 2015


 svx/source/svdraw/svdotext.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fb4bf4580f6244d044a80f4de501753cc2b4be70
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Sep 20 20:54:52 2015 +0200

    loplugin:stringconstant
    
    Change-Id: I5337566bad2a63de4ead73022bfafba7f050059a

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index aa06f1c..f8362c7 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2010,7 +2010,7 @@ void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString const& aNextLinkName)
     // XXX: Current implementation constraints text boxes to be on the same page
 
     // No next link
-    if (aNextLinkName == "") {
+    if (aNextLinkName.isEmpty()) {
         pTextObj->SetNextLinkInChain(NULL);
         return;
     }
@@ -2034,14 +2034,14 @@ bool SdrTextObj::IsChainable() const
     OUString aNextLinkName = static_cast<const SfxStringItem&>(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue();
 
     // Update links if any inconsistency is found
-    bool bNextLinkUnsetYet = (aNextLinkName != "") && !mpNextInChain;
+    bool bNextLinkUnsetYet = !aNextLinkName.isEmpty() && !mpNextInChain;
     bool bInconsistentNextLink = mpNextInChain && mpNextInChain->GetName() != aNextLinkName;
     // if the link is not set despite there should be one OR if it has changed
     if (bNextLinkUnsetYet || bInconsistentNextLink) {
         ImpUpdateChainLinks(const_cast<SdrTextObj *>(this), aNextLinkName);
     }
 
-    return aNextLinkName != ""; // XXX: Should we also check for GetNilChainingEvent? (see old code below)
+    return !aNextLinkName.isEmpty(); // XXX: Should we also check for GetNilChainingEvent? (see old code below)
 
 /*
     // Check that no overflow is going on


More information about the Libreoffice-commits mailing list