From a23801b740d8ec952097a5e2a2feb450bc0e585f Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Mon, 29 Sep 2014 19:08:02 -0400
Subject: Scope reduction by early bail-out.

Change-Id: Iacbf9f46a1b5683b6de5dd93002a69078af46951
---
 sc/source/core/data/table2.cxx | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 401a148d8c1c..882c481bc70b 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -484,47 +484,47 @@ void ScTable::CopyToClip(
     sc::CopyToClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
     ScTable* pTable )
 {
-    if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
-    {
-        //  copy content
-        //local range names need to be copied first for formula cells
-        if (!pTable->mpRangeName && mpRangeName)
-            pTable->mpRangeName = new ScRangeName(*mpRangeName);
+    if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
+        return;
 
-        SCCOL i;
+    //  copy content
+    //local range names need to be copied first for formula cells
+    if (!pTable->mpRangeName && mpRangeName)
+        pTable->mpRangeName = new ScRangeName(*mpRangeName);
 
-        for ( i = nCol1; i <= nCol2; i++)
-            aCol[i].CopyToClip(rCxt, nRow1, nRow2, pTable->aCol[i]);  // notes are handled at column level
+    SCCOL i;
 
-        //  copy widths/heights, and only "hidden", "filtered" and "manual" flags
-        //  also for all preceding columns/rows, to have valid positions for drawing objects
+    for ( i = nCol1; i <= nCol2; i++)
+        aCol[i].CopyToClip(rCxt, nRow1, nRow2, pTable->aCol[i]);  // notes are handled at column level
 
-        if (pColWidth && pTable->pColWidth)
-            for (i=0; i<=nCol2; i++)
-                pTable->pColWidth[i] = pColWidth[i];
+    //  copy widths/heights, and only "hidden", "filtered" and "manual" flags
+    //  also for all preceding columns/rows, to have valid positions for drawing objects
 
-        pTable->CopyColHidden(*this, 0, nCol2);
-        pTable->CopyColFiltered(*this, 0, nCol2);
-        if (pDBDataNoName)
-            pTable->SetAnonymousDBData(new ScDBData(*pDBDataNoName));
+    if (pColWidth && pTable->pColWidth)
+        for (i=0; i<=nCol2; i++)
+            pTable->pColWidth[i] = pColWidth[i];
 
-        if (pRowFlags && pTable->pRowFlags && mpRowHeights && pTable->mpRowHeights)
-        {
-            pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2, CR_MANUALSIZE);
-            pTable->CopyRowHeight(*this, 0, nRow2, 0);
-        }
+    pTable->CopyColHidden(*this, 0, nCol2);
+    pTable->CopyColFiltered(*this, 0, nCol2);
+    if (pDBDataNoName)
+        pTable->SetAnonymousDBData(new ScDBData(*pDBDataNoName));
+
+    if (pRowFlags && pTable->pRowFlags && mpRowHeights && pTable->mpRowHeights)
+    {
+        pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2, CR_MANUALSIZE);
+        pTable->CopyRowHeight(*this, 0, nRow2, 0);
+    }
 
-        pTable->CopyRowHidden(*this, 0, nRow2);
-        pTable->CopyRowFiltered(*this, 0, nRow2);
+    pTable->CopyRowHidden(*this, 0, nRow2);
+    pTable->CopyRowFiltered(*this, 0, nRow2);
 
-        //  ggf. Formeln durch Werte ersetzen
+    //  ggf. Formeln durch Werte ersetzen
 
-        if ( IsProtected() )
-            for (i = nCol1; i <= nCol2; i++)
-                pTable->aCol[i].RemoveProtected(nRow1, nRow2);
+    if ( IsProtected() )
+        for (i = nCol1; i <= nCol2; i++)
+            pTable->aCol[i].RemoveProtected(nRow1, nRow2);
 
-        pTable->mpCondFormatList.reset(new ScConditionalFormatList(pTable->pDocument, *mpCondFormatList));
-    }
+    pTable->mpCondFormatList.reset(new ScConditionalFormatList(pTable->pDocument, *mpCondFormatList));
 }
 
 void ScTable::CopyToClip(
-- 
cgit