Kaydet (Commit) ef03feef authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Reduce indentation level by early bail-out.

Change-Id: I5e108efa0219620696d15a304d2f4e3566d58d57
üst 3a9b5608
...@@ -2438,15 +2438,18 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar ...@@ -2438,15 +2438,18 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
bool bAsLink, bool bIncludeFiltered, bool bSkipAttrForEmpty, bool bAsLink, bool bIncludeFiltered, bool bSkipAttrForEmpty,
const ScRangeList * pDestRanges ) const ScRangeList * pDestRanges )
{ {
if (!bIsClip) if (bIsClip)
{ return;
if (!pClipDoc) if (!pClipDoc)
{ {
OSL_FAIL("CopyFromClip: no ClipDoc"); OSL_FAIL("CopyFromClip: no ClipDoc");
pClipDoc = SC_MOD()->GetClipDoc(); pClipDoc = SC_MOD()->GetClipDoc();
} }
if (pClipDoc->bIsClip && pClipDoc->GetTableCount())
{ if (!pClipDoc->bIsClip || !pClipDoc->GetTableCount())
return;
bool bOldAutoCalc = GetAutoCalc(); bool bOldAutoCalc = GetAutoCalc();
SetAutoCalc( false ); // avoid multiple recalculations SetAutoCalc( false ); // avoid multiple recalculations
...@@ -2603,8 +2606,6 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar ...@@ -2603,8 +2606,6 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
if (bResetCut) if (bResetCut)
pClipDoc->GetClipParam().mbCutMode = false; pClipDoc->GetClipParam().mbCutMode = false;
SetAutoCalc( bOldAutoCalc ); SetAutoCalc( bOldAutoCalc );
}
}
} }
static SCROW lcl_getLastNonFilteredRow( static SCROW lcl_getLastNonFilteredRow(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment