[Libreoffice-commits] core.git: 3 commits - i18npool/source vcl/source

[Khaled Hosny]

 i18npool/source/breakiterator/breakiterator_ctl.cxx |   40 ++++++++++----------
 vcl/source/gdi/pdfwriter_impl.cxx                   |    2 -
 vcl/source/gdi/sallayout.cxx                        |    3 -
 3 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit d6fd801c62e41c1fb229cbe97c0ef767705de304
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Jun 22 11:25:19 2013 +0200

    Fix indentation
    
    Change-Id: Iece106040fb7c0962d7f918151bff8c4488704a3

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 9b34224..48f4a6a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7773,7 +7773,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
                     // TODO: sanitize for RTL ligatures, more complex CTL, etc.
                     if( nChars < 0 )
                         nChars = -nChars;
-            else if( nChars == 0 )
+                    else if( nChars == 0 )
                         nChars = 1;
                     pUnicodesPerGlyph[i] = nChars;
                     for( int n = 1; n < nChars; n++ )
commit 4e6b13fb23ea83013407dbd3281e6ebeba699544
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Jun 22 11:23:46 2013 +0200

    Fix indentation
    
    Change-Id: I8e1621a160ea78b18a5b366f61938fa4dadd72e4

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 4df3123..314de78 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -350,8 +350,7 @@ bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL )
     {
         int nRunPos0 = maRuns[ nIndex-2 ];
         int nRunPos1 = maRuns[ nIndex-1 ];
-        if( ((nCharPos + bRTL) == nRunPos1)
-    &&  ((nRunPos0 > nRunPos1) == bRTL) )
+        if( ((nCharPos + bRTL) == nRunPos1) && ((nRunPos0 > nRunPos1) == bRTL) )
         {
             // extend current run by new charpos
             maRuns[ nIndex-1 ] = nCharPos + !bRTL;
commit 38cbae190dd4975d87c07e959fa5ba67b9ee6eb6
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Jun 22 10:55:43 2013 +0200

    Fix indentation
    
    Change-Id: I67224a03f7de2db6cab220b9491a6f949ad89def

diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 4c21e79..0c5be06 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -59,17 +59,17 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
         nDone = 0;
         if (nStartPos > 0) {    // for others to skip cell.
-        makeIndex(Text, nStartPos);
-
-        if (nextCellIndex[nStartPos-1] == 0) // not a CTL character
-            return BreakIterator_Unicode::previousCharacters(Text, nStartPos, rLocale,
-                nCharacterIteratorMode, nCount, nDone);
-        else while (nCount > 0 && nextCellIndex[nStartPos - 1] > 0) {
-            nCount--; nDone++;
-            nStartPos = previousCellIndex[nStartPos - 1];
-        }
+            makeIndex(Text, nStartPos);
+
+            if (nextCellIndex[nStartPos-1] == 0) // not a CTL character
+                return BreakIterator_Unicode::previousCharacters(Text, nStartPos, rLocale,
+                    nCharacterIteratorMode, nCount, nDone);
+            else while (nCount > 0 && nextCellIndex[nStartPos - 1] > 0) {
+                nCount--; nDone++;
+                nStartPos = previousCellIndex[nStartPos - 1];
+            }
         } else
-        nStartPos = 0;
+            nStartPos = 0;
     } else { // for BS to delete one char.
         nDone = (nStartPos > nCount) ? nCount : nStartPos;
         nStartPos -= nDone;
@@ -87,17 +87,17 @@ sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text,
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
         nDone = 0;
         if (nStartPos < len) {
-        makeIndex(Text, nStartPos);
-
-        if (nextCellIndex[nStartPos] == 0) // not a CTL character
-            return BreakIterator_Unicode::nextCharacters(Text, nStartPos, rLocale,
-                nCharacterIteratorMode, nCount, nDone);
-        else while (nCount > 0 && nextCellIndex[nStartPos] > 0) {
-            nCount--; nDone++;
-            nStartPos = nextCellIndex[nStartPos];
-        }
+            makeIndex(Text, nStartPos);
+
+            if (nextCellIndex[nStartPos] == 0) // not a CTL character
+                return BreakIterator_Unicode::nextCharacters(Text, nStartPos, rLocale,
+                    nCharacterIteratorMode, nCount, nDone);
+            else while (nCount > 0 && nextCellIndex[nStartPos] > 0) {
+                nCount--; nDone++;
+                nStartPos = nextCellIndex[nStartPos];
+            }
         } else
-        nStartPos = len;
+            nStartPos = len;
     } else {
         nDone = (len - nStartPos > nCount) ? nCount : len - nStartPos;
         nStartPos += nDone;