loplugin:stringconstant: handle OUString+=OUString(literal)

Change-Id: I8e819192d4464c3d03feb908b9acae5f91161fe9

2 files changed, 21 insertions, 35 deletions

diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index 13bec5376c57..6d35284e974e 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -244,34 +244,29 @@ OUString BufferNode::printChildren() const
 
     for( ; ii != m_vElementCollectors.end() ; ++ii )
     {
-        rc += OUString( "BufID=" );
-        rc += OUString::number((*ii)->getBufferId());
+        rc += "BufID=" + OUString::number((*ii)->getBufferId());
 
         if ((*ii)->getModify())
         {
-            rc += OUString( "[M]" );
+            rc += "[M]";
         }
 
-        rc += OUString( ",Pri=" );
+        rc += ",Pri=";
 
         switch ((*ii)->getPriority())
         {
             case cssxc::sax::ElementMarkPriority_BEFOREMODIFY:
-                rc += OUString( "BEFOREMODIFY" );
+                rc += "BEFOREMODIFY";
                 break;
             case cssxc::sax::ElementMarkPriority_AFTERMODIFY:
-                rc += OUString( "AFTERMODIFY" );
+                rc += "AFTERMODIFY";
                 break;
             default:
-                rc += OUString( "UNKNOWN" );
+                rc += "UNKNOWN";
                 break;
         }
 
-        rc += OUString( "(" );
-        rc += OUString( "SecID=" );
-        rc += OUString::number((*ii)->getSecurityId());
-        rc += OUString( ")" );
-        rc += OUString( " " );
+        rc += "(SecID=" + OUString::number((*ii)->getSecurityId()) + ") ";
     }
 
     return rc;
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index e6fa9ee63a00..6bbd167f448c 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -349,44 +349,36 @@ OUString SAXEventKeeperImpl::printBufferNode(
 
     for ( int i=0; i<nIndent; ++i )
     {
-        rc += OUString( " " );
+        rc += " ";
     }
 
     if (pBufferNode == m_pCurrentBufferNode)
     {
-        rc += OUString( "[%]" );
+        rc += "[%]";
     }
 
     if (pBufferNode == m_pCurrentBlockingBufferNode)
     {
-        rc += OUString( "[B]" );
+        rc += "[B]";
     }
 
-    rc += OUString( " " );
-    rc += m_xXMLDocument->getNodeName(pBufferNode->getXMLElement());
+    rc += " " + m_xXMLDocument->getNodeName(pBufferNode->getXMLElement());
 
     BufferNode* pParent = const_cast<BufferNode*>(pBufferNode->getParent());
     if (pParent != NULL)
     {
-        rc += OUString( "[" );
-        rc += m_xXMLDocument->getNodeName(pParent->getXMLElement());
-        rc += OUString( "]" );
+        rc += "[" + m_xXMLDocument->getNodeName(pParent->getXMLElement()) + "]";
     }
 
-    rc += OUString( ":EC=" );
-    rc += pBufferNode->printChildren();
-    rc += OUString( " BR=" );
+    rc += ":EC=" + pBufferNode->printChildren() + " BR=";
 
     ElementMark * pBlocker = pBufferNode->getBlocker();
     if (pBlocker != NULL)
     {
-        rc += OUString::number( pBlocker->getBufferId() );
-        rc += OUString( "(SecId=" );
-        rc += OUString::number( pBlocker->getSecurityId() );
-        rc += OUString( ")" );
-        rc += OUString( " " );
+        rc += OUString::number( pBlocker->getBufferId() ) + "(SecId="
+            + OUString::number( pBlocker->getSecurityId() ) + ") ";
     }
-    rc += OUString( "\n" );
+    rc += "\n";
 
     std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren();
     std::vector< const BufferNode* >::const_iterator jj = vChildren->begin();
@@ -1050,12 +1042,11 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
 {
     OUString rc;
 
-    rc += OUString( "ElementMarkBuffers: size = " );
-    rc += OUString::number(m_vElementMarkBuffers.size());
-    rc += OUString( "\nCurrentBufferNode: " );
-    rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement());
-    rc += OUString( "\n" );
-    rc += printBufferNode(m_pRootBufferNode, 0);
+    rc += "ElementMarkBuffers: size = "
+        + OUString::number(m_vElementMarkBuffers.size())
+        + "\nCurrentBufferNode: "
+        + m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement())
+        + "\n" + printBufferNode(m_pRootBufferNode, 0);
 
     return rc;
 }