[ooo-build-commit] .: sw/source

[Caolán McNamara]

 sw/source/core/text/itratr.cxx |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 259ffea1d4010ec4e4e6f674786366ed6b6d433e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 15:58:05 2010 +0100

    && || ambiguity in itratr.cxx

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index f95a173..5afacc5 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -916,12 +916,20 @@ USHORT SwTxtNode::GetScalingOfSelectedText(	xub_StrLen nStt, xub_StrLen nEnd )
         while( nStop < nEnd && nStop < nNextChg )
         {
             cChar = m_Text.GetChar( nStop );
-            if( CH_TAB == cChar || CH_BREAK == cChar ||
-                CHAR_HARDBLANK == cChar || CHAR_HARDHYPHEN == cChar ||
+            if (
+                CH_TAB == cChar ||
+                CH_BREAK == cChar ||
+                CHAR_HARDBLANK == cChar ||
+                CHAR_HARDHYPHEN == cChar ||
                 CHAR_SOFTHYPHEN == cChar ||
-               ( CH_TXTATR_BREAKWORD == cChar ||  CH_TXTATR_INWORD == cChar ) &&
-               ( 0 == ( pHint = aIter.GetAttr( nStop ) ) ) )
+                (
+                  (CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar) &&
+                  (0 == (pHint = aIter.GetAttr(nStop)))
+                )
+               )
+            {
                 break;
+            }
             else
                 ++nStop;
         }