diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-02-28 02:48:32 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-03-07 21:59:21 +0000 |
| commit | e1e2defb2cd9b572747b964e5ec97d289029af8c (patch) | |
| tree | 829ba713e18c1cb29c46215c299004ac972b2bae /sc/source/core/data/attarray.cxx | |
| parent | bb7073abf58d2b4334bb5508e4d392b96bcca9de (diff) | |
tdf#50916 Simplify and refactor source code
Change-Id: Ibcb3068318180f2adfdc41aac5d75299c1ffaffc
Reviewed-on: https://gerrit.libreoffice.org/34711
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'sc/source/core/data/attarray.cxx')
| -rw-r--r-- | sc/source/core/data/attarray.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index eb530ed75442..cfbb1c0e133d 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -49,7 +49,7 @@ using ::editeng::SvxBorderLine; -ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, ScAttrArray* pNextColAttrArray, bool bCreateEmpty ) : +ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, ScAttrArray* pDefaultColAttrArray ) : nCol( nNewCol ), nTab( nNewTab ), pDocument( pDoc ), @@ -57,10 +57,10 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, ScAttr nLimit(0), pData(nullptr) { - if ( nCol != -1 && !bCreateEmpty && pNextColAttrArray ) + if ( nCol != -1 && pDefaultColAttrArray ) { - nCount = pNextColAttrArray->nCount; - nLimit = pNextColAttrArray->nCount; + nCount = pDefaultColAttrArray->nCount; + nLimit = pDefaultColAttrArray->nCount; if ( nCount ) { bool bNumFormatChanged; @@ -69,8 +69,8 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, ScAttr pData = new ScAttrEntry[nCount]; for ( size_t nIdx = 0; nIdx < nCount; ++nIdx ) { - pData[nIdx].nRow = pNextColAttrArray->pData[nIdx].nRow; - ScPatternAttr aNewPattern( *(pNextColAttrArray->pData[nIdx].pPattern) ); + pData[nIdx].nRow = pDefaultColAttrArray->pData[nIdx].nRow; + ScPatternAttr aNewPattern( *(pDefaultColAttrArray->pData[nIdx].pPattern) ); pData[nIdx].pPattern = static_cast<const ScPatternAttr*>( &pDocument->GetPool()->Put( aNewPattern ) ); bNumFormatChanged = false; if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged, |