From a840d359aaac703e712afb5ecb00fd7a24fcbc52 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Sat, 26 Mar 2011 19:44:24 +0000
Subject: [PATCH] Code simplification.

---
 .../org/eclipse/cdt/internal/formatter/Scribe.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java
index 4ee541ec591..e94b787cf9e 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java
@@ -514,13 +514,10 @@ public class Scribe {
 		int indent= someColumn - 1;
 		if (indent == 0)
 			return indentationLevel;
-		if (tabChar == DefaultCodeFormatterOptions.TAB) {
-			if (useTabsOnlyForLeadingIndents) {
-				return indent;
-			}
-			int rem= indent % indentationSize;
-			int addition= rem == 0 ? 0 : indentationSize - rem; // round to superior
-			return indent + addition;
+		if (tabChar == DefaultCodeFormatterOptions.TAB && !useTabsOnlyForLeadingIndents) {
+			// Round up to a multiple of indentationSize.
+			indent += indentationSize - 1;
+			return indent - indent % indentationSize;
 		} else {
 			return indent;
 		}