svn commit: r1732344 - in /openoffice/branches/gbuild-reintegration: ./ main/writerfilter/source/resourcemodel/TagLogger.cxx

[damjan]

Author: damjan
Date: Thu Feb 25 18:58:39 2016
New Revision: 1732344

URL: http://svn.apache.org/viewvc?rev=1732344&view=rev
Log:
Merge r1409463 from branches/gbuild:
writerfilter10: unxsols4.pro: Handle warning in TagLogger.cxx

BUILDS


Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/TagLogger.cxx

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 18:58:39 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462-1409463,1409470
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: 
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/TagLogger.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/TagLogger.cxx?rev=1732344&r1=1732343&r2=1732344&view=diff
==============================================================================
--- 
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/TagLogger.cxx
 (original)
+++ 
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/TagLogger.cxx
 Thu Feb 25 18:58:39 2016
@@ -178,14 +178,16 @@ string XMLTag::toTree(const string & sIn
 
     string sResult;
     
-    size_t nSize = sIndent.size();
-    if (nSize > 1)
     {
-        sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
-    }
-    else
-    {
-        sResult += "\\" + mTag;
+        size_t nSize = sIndent.size();
+        if (nSize > 1)
+        {
+            sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
+        }
+        else
+        {
+            sResult += "\\" + mTag;
+        }
     }
         
     XMLAttributes_t::const_iterator aIt = mAttrs.begin();