diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-06 11:09:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 07:09:12 +0100 |
| commit | 9a97b9c051735afb3797888d111f1b6b2cab1a83 (patch) | |
| tree | fb2118bdc43c4a9d83d25cadf452e020a8143b9b /sw/source/filter/ww8/ww8par2.cxx | |
| parent | b3ee860e523dce3df16350a4053a67f39c2f92f8 (diff) | |
use more Color in sw
Change-Id: I51d575c40228bbd2ff384f12da33c1cd8bda2dda
Reviewed-on: https://gerrit.libreoffice.org/50800
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/ww8par2.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 4374a1cf9ab3..1ab7029bca8e 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1071,8 +1071,8 @@ WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc const & rBand ) } if( rBand.pNewSHDs ) { - pNewSHDs = new sal_uInt32[nWwCols]; - memcpy(pNewSHDs, rBand.pNewSHDs, nWwCols * sizeof(sal_uInt32)); + pNewSHDs = new Color[nWwCols]; + memcpy(pNewSHDs, rBand.pNewSHDs, nWwCols * sizeof(Color)); } memcpy(aDefBrcs, rBand.aDefBrcs, sizeof(aDefBrcs)); } @@ -1556,7 +1556,7 @@ void WW8TabBandDesc::ReadNewShd(const sal_uInt8* pS, bool bVer67) return; if (!pNewSHDs) - pNewSHDs = new sal_uInt32[nWwCols]; + pNewSHDs = new Color[nWwCols]; short nCount = nLen / 10; //10 bytes each if (nCount > nWwCols) @@ -1567,7 +1567,7 @@ void WW8TabBandDesc::ReadNewShd(const sal_uInt8* pS, bool bVer67) pNewSHDs[i++] = SwWW8ImplReader::ExtractColour(pS, bVer67); while (i < nWwCols) - pNewSHDs[i++] = sal_uInt32(COL_AUTO); + pNewSHDs[i++] = COL_AUTO; } void WW8TabBandDesc::setcelldefaults(WW8_TCell *pCells, short nCols) @@ -3038,7 +3038,7 @@ void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx ) return; // faked cells -> no color bool bFound=false; - if (m_pActBand->pNewSHDs && m_pActBand->pNewSHDs[nWwIdx] != sal_uInt32(COL_AUTO)) + if (m_pActBand->pNewSHDs && m_pActBand->pNewSHDs[nWwIdx] != COL_AUTO) { Color aColor(m_pActBand->pNewSHDs[nWwIdx]); pBox->GetFrameFormat()->SetFormatAttr(SvxBrushItem(aColor, RES_BACKGROUND)); |