diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-09-05 22:01:41 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-09-06 23:53:43 +0200 |
| commit | 5b47818367290640421f835bdd038bc35c6b0781 (patch) | |
| tree | 62c41a82c50a3b41d2f576d80c66bec19323510c /sc/source/core/data/attarray.cxx | |
| parent | 450b31a056a8fb277a7b5f1e6827bb85b4c1f9fd (diff) | |
merge area does not need to be increased if a shadow is attached
Diffstat (limited to 'sc/source/core/data/attarray.cxx')
| -rw-r--r-- | sc/source/core/data/attarray.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 4296beb707a0..d2a75b126b5a 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1352,7 +1352,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const // Area around any given summaries expand and adapt any MergeFlag (bRefresh) sal_Bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, - sal_Bool bRefresh, sal_Bool bAttrs ) + sal_Bool bRefresh ) { const ScPatternAttr* pPattern; const ScMergeAttr* pItem; @@ -1379,19 +1379,6 @@ sal_Bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRo rPaintRow = nMergeEndRow; bFound = sal_True; - if (bAttrs) - { - const SvxShadowItem* pShadow = - (const SvxShadowItem*) &pPattern->GetItem( ATTR_SHADOW ); - SvxShadowLocation eLoc = pShadow->GetLocation(); - if ( eLoc == SVX_SHADOW_TOPRIGHT || eLoc == SVX_SHADOW_BOTTOMRIGHT ) - if ( nMergeEndCol+1 > rPaintCol && nMergeEndCol < MAXCOL ) - rPaintCol = nMergeEndCol+1; - if ( eLoc == SVX_SHADOW_BOTTOMLEFT || eLoc == SVX_SHADOW_BOTTOMRIGHT ) - if ( nMergeEndRow+1 > rPaintRow && nMergeEndRow < MAXROW ) - rPaintRow = nMergeEndRow+1; - } - if (bRefresh) { if ( nMergeEndCol > nThisCol ) |