Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4207

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/4207/1

adjusted code indentation for consistency

Change-Id: I0316e8753e440ff691e9c84f55aad8a6a7079652
---
M sw/source/core/edit/edglbldc.cxx
M sw/source/core/edit/editsh.cxx
M sw/source/core/edit/edlingu.cxx
M sw/source/core/edit/ednumber.cxx
M sw/source/core/edit/edundo.cxx
M sw/source/core/edit/edws.cxx
6 files changed, 13 insertions(+), 14 deletions(-)



diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index b19b839..8a549c2 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -69,7 +69,8 @@
             SwGlblDocContent* pNew;
             switch( pSect->GetType() )
             {
-            case TOX_HEADER_SECTION:    break;      // ignore
+            case TOX_HEADER_SECTION:
+                break;      // ignore
             case TOX_CONTENT_SECTION:
                 OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
                 pNew = new SwGlblDocContent( (SwTOXBaseSection*)pSect );
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 8e2dbed..a13598a 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -711,7 +711,7 @@
                     rArr.push_back( pNew );
                 }
             }
-    }
+        }
     }
     return rArr.size();
 }
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 4702b4f..c72cf02 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -900,7 +900,8 @@
                 // don't determine the rectangle in the current line
                 xub_StrLen nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + 
nLeft;
                 // take one less than the line end - otherwise the next line would be calculated
-                xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd: 
(nBegin + nLen - nLeft - nRight);
+                xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd
+                                        ? nLineEnd : (nBegin + nLen - nLeft - nRight);
                 Push();
                 pCrsr->DeleteMark();
                 SwIndex& rContent = GetCrsr()->GetPoint()->nContent;
@@ -1025,7 +1026,8 @@
                 // don't determine the rectangle in the current line
                 xub_StrLen nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + 
nLeft;
                 // take one less than the line end - otherwise the next line would be calculated
-                xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd: 
(nBegin + nLen - nLeft - nRight);
+                xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd
+                                        ? nLineEnd : (nBegin + nLen - nLeft - nRight);
                 Push();
                 pCrsr->DeleteMark();
                 SwIndex& rContent = GetCrsr()->GetPoint()->nContent;
@@ -1072,8 +1074,7 @@
     pSpellIter->ToSentenceStart();
 }
 
-static sal_uInt32 lcl_CountRedlines(
-                            const ::svx::SpellPortions& rLastPortions)
+static sal_uInt32 lcl_CountRedlines(const ::svx::SpellPortions& rLastPortions)
 {
     sal_uInt32 nRet = 0;
     SpellPortions::const_iterator aIter = rLastPortions.begin();
@@ -1385,8 +1386,8 @@
             pCrsr->SetMark();
             --GetCrsrCnt();
         }
-    }
-    while ( bGoOn );
+    } while ( bGoOn );
+
     if(xSpellRet.is() || bGrammarErrorFound)
     {
         // an error has been found
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index fe5d91a..5d3afe0 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -443,8 +443,7 @@
     aCrsr.SetMark();
     if( pCrsr->HasMark() )
         *aCrsr.GetPoint() = *pCrsr->End();
-    GetDoc()->GotoNextNum( *aCrsr.GetPoint(), false,
-                            &rUpper, &rLower );
+    GetDoc()->GotoNextNum( *aCrsr.GetPoint(), false, &rUpper, &rLower );
 }
 
 bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 79fc76a..bd27446 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -43,8 +43,7 @@
     return GetDoc()->GetDocShell()->GetModel()->hasControllersLocked();
 }
 
-void
-SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
+void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
 {
     // do nothing if somebody has locked controllers!
     if (CursorsLocked())
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index acf268e..e006f56 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -228,8 +228,7 @@
  * @param eUndoId   ID of the undo container
  * @param pRewriter ?
 */
-SwUndoId SwEditShell::EndUndo(SwUndoId eUndoId,
-                                const SwRewriter *pRewriter)
+SwUndoId SwEditShell::EndUndo(SwUndoId eUndoId, const SwRewriter *pRewriter)
 { return GetDoc()->GetIDocumentUndoRedo().EndUndo(eUndoId, pRewriter); }
 
 bool     SwEditShell::GetLastUndoInfo(OUString *const o_pStr,

-- 
To view, visit https://gerrit.libreoffice.org/4207
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0316e8753e440ff691e9c84f55aad8a6a7079652
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer <ruderphilipp@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.