diff options
26 files changed, 209 insertions, 209 deletions
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index b7d6659e7e2f..3a95896d96fa 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -191,12 +191,12 @@ typedef sfx::IdentItemWrapper< SvxShadowItem > ShadowItemWrapper; typedef sfx::ValueSetWrapper< SvxShadowLocation > ShadowPosWrapper; static const ShadowPosWrapper::MapEntryType s_pShadowPosMap[] = { - { 1, SVX_SHADOW_NONE }, - { 2, SVX_SHADOW_BOTTOMRIGHT }, - { 3, SVX_SHADOW_TOPRIGHT }, - { 4, SVX_SHADOW_BOTTOMLEFT }, - { 5, SVX_SHADOW_TOPLEFT }, - { WRAPPER_VALUESET_ITEM_NOTFOUND, SVX_SHADOW_NONE } + { 1, SvxShadowLocation::NONE }, + { 2, SvxShadowLocation::BottomRight }, + { 3, SvxShadowLocation::TopRight }, + { 4, SvxShadowLocation::BottomLeft }, + { 5, SvxShadowLocation::TopLeft }, + { WRAPPER_VALUESET_ITEM_NOTFOUND, SvxShadowLocation::NONE } }; class ShadowControlsWrapper : public sfx::MultiControlWrapper< SvxShadowItem > diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ffff58e31f4c..2f235b29dc7e 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1308,10 +1308,10 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const table::ShadowLocation eSet = table::ShadowLocation_NONE; switch( eLocation ) { - case SVX_SHADOW_TOPLEFT : eSet = table::ShadowLocation_TOP_LEFT ; break; - case SVX_SHADOW_TOPRIGHT : eSet = table::ShadowLocation_TOP_RIGHT ; break; - case SVX_SHADOW_BOTTOMLEFT : eSet = table::ShadowLocation_BOTTOM_LEFT ; break; - case SVX_SHADOW_BOTTOMRIGHT: eSet = table::ShadowLocation_BOTTOM_RIGHT; break; + case SvxShadowLocation::TopLeft : eSet = table::ShadowLocation_TOP_LEFT ; break; + case SvxShadowLocation::TopRight : eSet = table::ShadowLocation_TOP_RIGHT ; break; + case SvxShadowLocation::BottomLeft : eSet = table::ShadowLocation_BOTTOM_LEFT ; break; + case SvxShadowLocation::BottomRight: eSet = table::ShadowLocation_BOTTOM_RIGHT; break; default: ; // prevent warning } aShadow.Location = eSet; @@ -1378,13 +1378,13 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if ( bRet ) { -// SvxShadowLocation eSet = SVX_SHADOW_NONE; +// SvxShadowLocation eSet = SvxShadowLocation::NONE; switch( aShadow.Location ) { - case table::ShadowLocation_TOP_LEFT : eLocation = SVX_SHADOW_TOPLEFT; break; - case table::ShadowLocation_TOP_RIGHT : eLocation = SVX_SHADOW_TOPRIGHT; break; - case table::ShadowLocation_BOTTOM_LEFT : eLocation = SVX_SHADOW_BOTTOMLEFT ; break; - case table::ShadowLocation_BOTTOM_RIGHT: eLocation = SVX_SHADOW_BOTTOMRIGHT; break; + case table::ShadowLocation_TOP_LEFT : eLocation = SvxShadowLocation::TopLeft; break; + case table::ShadowLocation_TOP_RIGHT : eLocation = SvxShadowLocation::TopRight; break; + case table::ShadowLocation_BOTTOM_LEFT : eLocation = SvxShadowLocation::BottomLeft ; break; + case table::ShadowLocation_BOTTOM_RIGHT: eLocation = SvxShadowLocation::BottomRight; break; default: ; // prevent warning } @@ -1421,26 +1421,26 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const switch ( nShadow ) { case SvxShadowItemSide::TOP: - if ( eLocation == SVX_SHADOW_TOPLEFT || - eLocation == SVX_SHADOW_TOPRIGHT ) + if ( eLocation == SvxShadowLocation::TopLeft || + eLocation == SvxShadowLocation::TopRight ) nSpace = nWidth; break; case SvxShadowItemSide::BOTTOM: - if ( eLocation == SVX_SHADOW_BOTTOMLEFT || - eLocation == SVX_SHADOW_BOTTOMRIGHT ) + if ( eLocation == SvxShadowLocation::BottomLeft || + eLocation == SvxShadowLocation::BottomRight ) nSpace = nWidth; break; case SvxShadowItemSide::LEFT: - if ( eLocation == SVX_SHADOW_TOPLEFT || - eLocation == SVX_SHADOW_BOTTOMLEFT ) + if ( eLocation == SvxShadowLocation::TopLeft || + eLocation == SvxShadowLocation::BottomLeft ) nSpace = nWidth; break; case SvxShadowItemSide::RIGHT: - if ( eLocation == SVX_SHADOW_TOPRIGHT || - eLocation == SVX_SHADOW_BOTTOMRIGHT ) + if ( eLocation == SvxShadowLocation::TopRight || + eLocation == SvxShadowLocation::BottomRight ) nSpace = nWidth; break; @@ -1473,7 +1473,7 @@ bool SvxShadowItem::GetPresentation OUString(cpDelim) + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + OUString(cpDelim) + - EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation); + EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); return true; } case SfxItemPresentation::Complete: @@ -1491,7 +1491,7 @@ bool SvxShadowItem::GetPresentation GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)) + OUString(cpDelim) + - EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation); + EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); return true; } default: ; // prevent warning @@ -1502,7 +1502,7 @@ bool SvxShadowItem::GetPresentation SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( GetLocation() ) + rStrm.WriteSChar( (sal_uInt8)GetLocation() ) .WriteUInt16( GetWidth() ) .WriteBool( aShadowColor.GetTransparency() > 0 ); WriteColor( rStrm, GetColor() ); @@ -1543,13 +1543,13 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const sal_uInt16 SvxShadowItem::GetValueCount() const { - return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 + return (sal_uInt16)SvxShadowLocation::End; // SvxShadowLocation::BottomRight + 1 } OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" ); + DBG_ASSERT( nPos < (sal_uInt16)SvxShadowLocation::End, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos ); } @@ -1571,8 +1571,8 @@ void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aShadowColor"), BAD_CAST(aShadowColor.AsRGBHexString().toUtf8().getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWidth"), BAD_CAST(OString::number(nWidth).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number(eLocation).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation).toUtf8().getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number((int)eLocation).getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation).toUtf8().getStr())); xmlTextWriterEndElement(pWriter); } diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index b2085cacebf5..bc3298b26943 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1514,7 +1514,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, case RTF_BRDRSH: // Shadowed border rSet.Put( SvxShadowItem( aPardMap.nShadow, nullptr, 60 /*3pt*/, - SVX_SHADOW_BOTTOMRIGHT ) ); + SvxShadowLocation::BottomRight ) ); break; case RTF_BRSP: // Spacing to content in twip diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 62d5af17d6d7..51d5ecfe86cc 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -43,7 +43,7 @@ public: explicit SvxShadowItem( const sal_uInt16 nId , const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/, - const SvxShadowLocation eLoc = SVX_SHADOW_NONE ); + const SvxShadowLocation eLoc = SvxShadowLocation::NONE ); inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index 1735267a0bf3..cfca47018ea3 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -39,14 +39,14 @@ enum class SvxEscapement End }; -enum SvxShadowLocation +enum class SvxShadowLocation { - SVX_SHADOW_NONE, - SVX_SHADOW_TOPLEFT, - SVX_SHADOW_TOPRIGHT, - SVX_SHADOW_BOTTOMLEFT, - SVX_SHADOW_BOTTOMRIGHT, - SVX_SHADOW_END + NONE, + TopLeft, + TopRight, + BottomLeft, + BottomRight, + End }; enum class SvxTabAdjust diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index d85b681de705..fadf5ab3190e 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -439,7 +439,7 @@ PosT PosValueMapper< PosT, ValueT >::GetPosFromValue( ValueT nValue ) const ++pEntry; nPos = pEntry->mnPos; } - else if( nValue >= 0 ) + else if( nValue >= static_cast< ValueT >(0) ) nPos = static_cast< PosT >( nValue ); return nPos; } diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index cfbb1c0e133d..98f3dc04b1eb 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1334,7 +1334,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, HasAttrFlags nMask ) cons { const SvxShadowItem* pShadow = static_cast<const SvxShadowItem*>( &pPattern->GetItem( ATTR_SHADOW ) ); - if ( pShadow->GetLocation() != SVX_SHADOW_NONE ) + if ( pShadow->GetLocation() != SvxShadowLocation::NONE ) bFound = true; } if ( nMask & HasAttrFlags::Conditional ) @@ -1418,10 +1418,10 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, HasAttrFlags nMask ) cons static_cast<const SvxShadowItem*>( &pPattern->GetItem( ATTR_SHADOW )); SvxShadowLocation eLoc = pShadow->GetLocation(); if ( nMask & HasAttrFlags::ShadowRight ) - if ( eLoc == SVX_SHADOW_TOPRIGHT || eLoc == SVX_SHADOW_BOTTOMRIGHT ) + if ( eLoc == SvxShadowLocation::TopRight || eLoc == SvxShadowLocation::BottomRight ) bFound = true; if ( nMask & HasAttrFlags::ShadowDown ) - if ( eLoc == SVX_SHADOW_BOTTOMLEFT || eLoc == SVX_SHADOW_BOTTOMRIGHT ) + if ( eLoc == SvxShadowLocation::BottomLeft || eLoc == SvxShadowLocation::BottomRight ) bFound = true; } if ( nMask & HasAttrFlags::RightOrCenter ) diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index d8ec3ed9eec3..ad9e56b36113 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -831,8 +831,8 @@ void ScDocument::FillInfo( CellInfo* pInfo = &pRowInfo[nArrRow].pCellInfo[nArrCol]; const SvxShadowItem* pThisAttr = pInfo->pShadowAttr; - SvxShadowLocation eLoc = pThisAttr ? pThisAttr->GetLocation() : SVX_SHADOW_NONE; - if (eLoc != SVX_SHADOW_NONE) + SvxShadowLocation eLoc = pThisAttr ? pThisAttr->GetLocation() : SvxShadowLocation::NONE; + if (eLoc != SvxShadowLocation::NONE) { // or test on != eLoc @@ -845,22 +845,22 @@ void ScDocument::FillInfo( --nDxNeg; bool bLeftDiff = !bLeft && - pRowInfo[nArrRow].pCellInfo[nArrCol+nDxNeg].pShadowAttr->GetLocation() == SVX_SHADOW_NONE; + pRowInfo[nArrRow].pCellInfo[nArrCol+nDxNeg].pShadowAttr->GetLocation() == SvxShadowLocation::NONE; bool bRightDiff = !bRight && - pRowInfo[nArrRow].pCellInfo[nArrCol+nDxPos].pShadowAttr->GetLocation() == SVX_SHADOW_NONE; + pRowInfo[nArrRow].pCellInfo[nArrCol+nDxPos].pShadowAttr->GetLocation() == SvxShadowLocation::NONE; bool bTopDiff = !bTop && - pRowInfo[nArrRow-1].pCellInfo[nArrCol].pShadowAttr->GetLocation() == SVX_SHADOW_NONE; + pRowInfo[nArrRow-1].pCellInfo[nArrCol].pShadowAttr->GetLocation() == SvxShadowLocation::NONE; bool bBottomDiff = !bBottom && - pRowInfo[nArrRow+1].pCellInfo[nArrCol].pShadowAttr->GetLocation() == SVX_SHADOW_NONE; + pRowInfo[nArrRow+1].pCellInfo[nArrCol].pShadowAttr->GetLocation() == SvxShadowLocation::NONE; if ( bLayoutRTL ) { switch (eLoc) { - case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; - case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; - case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; - case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; + case SvxShadowLocation::BottomRight: eLoc = SvxShadowLocation::BottomLeft; break; + case SvxShadowLocation::BottomLeft: eLoc = SvxShadowLocation::BottomRight; break; + case SvxShadowLocation::TopRight: eLoc = SvxShadowLocation::TopLeft; break; + case SvxShadowLocation::TopLeft: eLoc = SvxShadowLocation::TopRight; break; default: { // added to avoid warnings @@ -870,7 +870,7 @@ void ScDocument::FillInfo( switch (eLoc) { - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: if (bBottomDiff) { pRowInfo[nArrRow+1].pCellInfo[nArrCol].pHShadowOrigin = pThisAttr; @@ -890,7 +890,7 @@ void ScDocument::FillInfo( } break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: if (bBottomDiff) { pRowInfo[nArrRow+1].pCellInfo[nArrCol].pHShadowOrigin = pThisAttr; @@ -910,7 +910,7 @@ void ScDocument::FillInfo( } break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: if (bTopDiff) { pRowInfo[nArrRow-1].pCellInfo[nArrCol].pHShadowOrigin = pThisAttr; @@ -930,7 +930,7 @@ void ScDocument::FillInfo( } break; - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: if (bTopDiff) { pRowInfo[nArrRow-1].pCellInfo[nArrCol].pHShadowOrigin = pThisAttr; diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 40ac77231f62..bb46e37a15c1 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -1181,7 +1181,7 @@ bool ScPatternAttr::IsVisible() const eState = rSet.GetItemState( ATTR_SHADOW, true, &pItem ); if ( eState == SfxItemState::SET ) - if ( static_cast<const SvxShadowItem*>(pItem)->GetLocation() != SVX_SHADOW_NONE ) + if ( static_cast<const SvxShadowItem*>(pItem)->GetLocation() != SvxShadowLocation::NONE ) return true; return false; diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 6368dfea5478..8382d983883d 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1230,10 +1230,10 @@ void ScOutputData::DrawExtraShadow(bool bLeft, bool bTop, bool bRight, bool bBot // so the attribute's location value is mirrored here and in FillInfo. switch (eLoc) { - case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; - case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; - case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; - case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; + case SvxShadowLocation::BottomRight: eLoc = SvxShadowLocation::BottomLeft; break; + case SvxShadowLocation::BottomLeft: eLoc = SvxShadowLocation::BottomRight; break; + case SvxShadowLocation::TopRight: eLoc = SvxShadowLocation::TopLeft; break; + case SvxShadowLocation::TopLeft: eLoc = SvxShadowLocation::TopRight; break; default: { // added to avoid warnings @@ -1244,7 +1244,7 @@ void ScOutputData::DrawExtraShadow(bool bLeft, bool bTop, bool bRight, bool bBot if (ePart == SC_SHADOW_HORIZ || ePart == SC_SHADOW_HSTART || ePart == SC_SHADOW_CORNER) { - if (eLoc == SVX_SHADOW_TOPLEFT || eLoc == SVX_SHADOW_TOPRIGHT) + if (eLoc == SvxShadowLocation::TopLeft || eLoc == SvxShadowLocation::TopRight) aRect.Top() = aRect.Bottom() - nSizeY; else aRect.Bottom() = aRect.Top() + nSizeY; @@ -1252,21 +1252,21 @@ void ScOutputData::DrawExtraShadow(bool bLeft, bool bTop, bool bRight, bool bBot if (ePart == SC_SHADOW_VERT || ePart == SC_SHADOW_VSTART || ePart == SC_SHADOW_CORNER) { - if (eLoc == SVX_SHADOW_TOPLEFT || eLoc == SVX_SHADOW_BOTTOMLEFT) + if (eLoc == SvxShadowLocation::TopLeft || eLoc == SvxShadowLocation::BottomLeft) aRect.Left() = aRect.Right() - nSizeX; else aRect.Right() = aRect.Left() + nSizeX; } if (ePart == SC_SHADOW_HSTART) { - if (eLoc == SVX_SHADOW_TOPLEFT || eLoc == SVX_SHADOW_BOTTOMLEFT) + if (eLoc == SvxShadowLocation::TopLeft || eLoc == SvxShadowLocation::BottomLeft) aRect.Right() -= nSizeX; else aRect.Left() += nSizeX; } if (ePart == SC_SHADOW_VSTART) { - if (eLoc == SVX_SHADOW_TOPLEFT || eLoc == SVX_SHADOW_TOPRIGHT) + if (eLoc == SvxShadowLocation::TopLeft || eLoc == SvxShadowLocation::TopRight) aRect.Bottom() -= nSizeY; else aRect.Top() += nSizeY; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 569e0c059c0a..a423db307ec5 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -758,7 +758,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) lcl_LineTotal(rParam.pBorder->GetLeft()) + lcl_LineTotal(rParam.pBorder->GetRight()) ) * 100 / nZoom; - if (rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE) + if (rParam.pShadow && rParam.pShadow->GetLocation() != SvxShadowLocation::NONE) nPaperWidth -= ( rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::LEFT) + rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::RIGHT) ) * 100L / nZoom; @@ -784,7 +784,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) rParam.pBorder->GetDistance(SvxBoxItemLine::BOTTOM) + lcl_LineTotal( rParam.pBorder->GetTop() ) + lcl_LineTotal( rParam.pBorder->GetBottom() ); - if (rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE) + if (rParam.pShadow && rParam.pShadow->GetLocation() != SvxShadowLocation::NONE) rParam.nHeight += rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::TOP) + rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::BOTTOM); @@ -1245,7 +1245,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, long nBottom = 0; // aFrameRect - outside around frame, without shadow - if ( pShadow && pShadow->GetLocation() != SVX_SHADOW_NONE ) + if ( pShadow && pShadow->GetLocation() != SvxShadowLocation::NONE ) { nLeft += (long) ( pShadow->CalcShadowSpace(SvxShadowItemSide::LEFT) * nScaleX ); nRight += (long) ( pShadow->CalcShadowSpace(SvxShadowItemSide::RIGHT) * nScaleX ); @@ -1291,7 +1291,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, } } - if ( pShadow && pShadow->GetLocation() != SVX_SHADOW_NONE ) + if ( pShadow && pShadow->GetLocation() != SvxShadowLocation::NONE ) { pDev->SetFillColor(pShadow->GetColor()); pDev->SetLineColor(); @@ -1299,7 +1299,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, long nShadowY = (long) ( pShadow->GetWidth() * nScaleY ); switch (pShadow->GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: pDev->DrawRect( Rectangle( aFrameRect.Left()-nShadowX, aFrameRect.Top()-nShadowY, aFrameRect.Right()-nShadowX, aFrameRect.Top() ) ); @@ -1307,7 +1307,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, aFrameRect.Left()-nShadowX, aFrameRect.Top()-nShadowY, aFrameRect.Left(), aFrameRect.Bottom()-nShadowY ) ); break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: pDev->DrawRect( Rectangle( aFrameRect.Left()+nShadowX, aFrameRect.Top()-nShadowY, aFrameRect.Right()+nShadowX, aFrameRect.Top() ) ); @@ -1315,7 +1315,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, aFrameRect.Right(), aFrameRect.Top()-nShadowY, aFrameRect.Right()+nShadowX, aFrameRect.Bottom()-nShadowY ) ); break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: pDev->DrawRect( Rectangle( aFrameRect.Left()-nShadowX, aFrameRect.Bottom(), aFrameRect.Right()-nShadowX, aFrameRect.Bottom()+nShadowY ) ); @@ -1323,7 +1323,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, aFrameRect.Left()-nShadowX, aFrameRect.Top()+nShadowY, aFrameRect.Left(), aFrameRect.Bottom()+nShadowY ) ); break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: pDev->DrawRect( Rectangle( aFrameRect.Left()+nShadowX, aFrameRect.Bottom(), aFrameRect.Right()+nShadowX, aFrameRect.Bottom()+nShadowY ) ); @@ -1739,7 +1739,7 @@ void ScPrintFunc::PrintHF( long nPageNo, bool bHeader, long nStartY, aPaperSize.Height() -= nTop + lcl_LineTotal( rParam.pBorder->GetBottom() ) + rParam.pBorder->GetDistance(SvxBoxItemLine::BOTTOM); } - if ( rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE ) + if ( rParam.pShadow && rParam.pShadow->GetLocation() != SvxShadowLocation::NONE ) { long nLeft = rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::LEFT); long nTop = rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::TOP); @@ -1772,7 +1772,7 @@ void ScPrintFunc::PrintHF( long nPageNo, bool bHeader, long nStartY, lcl_LineTotal( rParam.pBorder->GetBottom() ) + rParam.pBorder->GetDistance(SvxBoxItemLine::TOP) + rParam.pBorder->GetDistance(SvxBoxItemLine::BOTTOM); - if (rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE) + if (rParam.pShadow && rParam.pShadow->GetLocation() != SvxShadowLocation::NONE) nMaxHeight += rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::TOP) + rParam.pShadow->CalcShadowSpace(SvxShadowItemSide::BOTTOM); @@ -2081,7 +2081,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if (pBorderItem) nDataWidth += pBorderItem->GetDistance(SvxBoxItemLine::LEFT) + pBorderItem->GetDistance(SvxBoxItemLine::RIGHT); //! Line width? - if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) + if (pShadowItem && pShadowItem->GetLocation() != SvxShadowLocation::NONE) nDataWidth += pShadowItem->CalcShadowSpace(SvxShadowItemSide::LEFT) + pShadowItem->CalcShadowSpace(SvxShadowItemSide::RIGHT); if ( bCenterHor ) @@ -2104,7 +2104,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if (pBorderItem) nDataHeight += pBorderItem->GetDistance(SvxBoxItemLine::TOP) + pBorderItem->GetDistance(SvxBoxItemLine::BOTTOM); //! Line width? - if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) + if (pShadowItem && pShadowItem->GetLocation() != SvxShadowLocation::NONE) nDataHeight += pShadowItem->CalcShadowSpace(SvxShadowItemSide::TOP) + pShadowItem->CalcShadowSpace(SvxShadowItemSide::BOTTOM); nTopSpace += ( aPageRect.GetHeight() - nDataHeight ) / 2; @@ -2150,7 +2150,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nInnerStartY += (long) ( ( lcl_LineTotal(pBorderItem->GetTop()) + pBorderItem->GetDistance(SvxBoxItemLine::TOP) ) * nScaleY ); } - if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) + if (pShadowItem && pShadowItem->GetLocation() != SvxShadowLocation::NONE) { nInnerStartX += (long) ( pShadowItem->CalcShadowSpace(SvxShadowItemSide::LEFT) * nScaleX ); nInnerStartY += (long) ( pShadowItem->CalcShadowSpace(SvxShadowItemSide::TOP) * nScaleY ); @@ -2204,7 +2204,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nBorderEndY += (long) ( ( lcl_LineTotal(pBorderItem->GetBottom()) + pBorderItem->GetDistance(SvxBoxItemLine::BOTTOM) ) * nScaleY ); } - if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) + if (pShadowItem && pShadowItem->GetLocation() != SvxShadowLocation::NONE) { nBorderEndX += (long) ( pShadowItem->CalcShadowSpace(SvxShadowItemSide::RIGHT) * nScaleX ); nBorderEndY += (long) ( pShadowItem->CalcShadowSpace(SvxShadowItemSide::BOTTOM) * nScaleY ); @@ -2928,7 +2928,7 @@ Size ScPrintFunc::GetDocPageSize() pBorderItem->GetDistance(SvxBoxItemLine::TOP) + pBorderItem->GetDistance(SvxBoxItemLine::BOTTOM); } - if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) + if (pShadowItem && pShadowItem->GetLocation() != SvxShadowLocation::NONE) { aDocPageSize.Width() -= pShadowItem->CalcShadowSpace(SvxShadowItemSide::LEFT) + pShadowItem->CalcShadowSpace(SvxShadowItemSide::RIGHT); diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 4b94ff256bdb..39a302fc6cde 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -872,8 +872,8 @@ inline sal_uInt16 SwFont::GetTopBorderSpace() const { nRet += m_aTopBorder.get().GetScaledWidth() + m_nTopBorderDist; } - if( m_aShadowLocation == SVX_SHADOW_TOPLEFT || - m_aShadowLocation == SVX_SHADOW_TOPRIGHT ) + if( m_aShadowLocation == SvxShadowLocation::TopLeft || + m_aShadowLocation == SvxShadowLocation::TopRight ) { nRet += m_nShadowWidth; } @@ -887,8 +887,8 @@ inline sal_uInt16 SwFont::GetBottomBorderSpace() const { nRet += m_aBottomBorder.get().GetScaledWidth() + m_nBottomBorderDist; } - if( m_aShadowLocation == SVX_SHADOW_BOTTOMLEFT || - m_aShadowLocation == SVX_SHADOW_BOTTOMRIGHT ) + if( m_aShadowLocation == SvxShadowLocation::BottomLeft || + m_aShadowLocation == SvxShadowLocation::BottomRight ) { nRet += m_nShadowWidth; } @@ -902,8 +902,8 @@ inline sal_uInt16 SwFont::GetRightBorderSpace() const { nRet += m_aRightBorder.get().GetScaledWidth() + m_nRightBorderDist; } - if( m_aShadowLocation == SVX_SHADOW_TOPRIGHT || - m_aShadowLocation == SVX_SHADOW_BOTTOMRIGHT ) + if( m_aShadowLocation == SvxShadowLocation::TopRight || + m_aShadowLocation == SvxShadowLocation::BottomRight ) { nRet += m_nShadowWidth; } @@ -917,8 +917,8 @@ inline sal_uInt16 SwFont::GetLeftBorderSpace() const { nRet += m_aLeftBorder.get().GetScaledWidth() + m_nLeftBorderDist; } - if( m_aShadowLocation == SVX_SHADOW_TOPLEFT || - m_aShadowLocation == SVX_SHADOW_BOTTOMLEFT ) + if( m_aShadowLocation == SvxShadowLocation::TopLeft || + m_aShadowLocation == SvxShadowLocation::BottomLeft ) { nRet += m_nShadowWidth; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index bbefcde3393c..3f9598e89944 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1439,7 +1439,7 @@ static void lcl_CalcBorderRect( SwRect &rRect, const SwFrame *pFrame, rRect.Pos() += pFrame->Frame().Pos(); if ( rAttrs.IsLine() || rAttrs.IsBorderDist() || - (bShadow && rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE) ) + (bShadow && rAttrs.GetShadow().GetLocation() != SvxShadowLocation::NONE) ) { SwRectFn fnRect = pFrame->IsVertical() ? ( pFrame->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori; @@ -1492,7 +1492,7 @@ static void lcl_CalcBorderRect( SwRect &rRect, const SwFrame *pFrame, // Increase of distance by one twip is incorrect. (rRect.*fnRect->fnAddRight)( rBox.GetDistance( SvxBoxItemLine::RIGHT ) ); - if ( bShadow && rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE ) + if ( bShadow && rAttrs.GetShadow().GetLocation() != SvxShadowLocation::NONE ) { const SvxShadowItem &rShadow = rAttrs.GetShadow(); if ( bTop ) @@ -4361,7 +4361,7 @@ void SwTabFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, const SwBorderAttrs &rAttrs = *aAccess.Get(); // paint shadow - if ( rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE ) + if ( rAttrs.GetShadow().GetLocation() != SvxShadowLocation::NONE ) { SwRect aRect; ::lcl_CalcBorderRect( aRect, this, rAttrs, true, gProp ); @@ -4414,7 +4414,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect, switch ( rShadow.GetLocation() ) { - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: { if ( bDrawFullShadowRectangle ) { @@ -4451,7 +4451,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect, rOutRect.Bottom( rOutRect.Bottom()- nHeight ); } break; - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: { if ( bDrawFullShadowRectangle ) { @@ -4488,7 +4488,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect, rOutRect.Top( rOutRect.Top() + nHeight ); } break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: { if ( bDrawFullShadowRectangle ) { @@ -4525,7 +4525,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect, rOutRect.Top( rOutRect.Top() + nHeight ); } break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: { if ( bDrawFullShadowRectangle ) { @@ -4622,10 +4622,10 @@ void SwFrame::PaintShadow( const SwRect& rRect, SwRect& rOutRect, { switch( rShadow.GetLocation() ) { - case SVX_SHADOW_BOTTOMRIGHT: rShadow.SetLocation(SVX_SHADOW_BOTTOMLEFT); break; - case SVX_SHADOW_TOPLEFT: rShadow.SetLocation(SVX_SHADOW_TOPRIGHT); break; - case SVX_SHADOW_TOPRIGHT: rShadow.SetLocation(SVX_SHADOW_BOTTOMRIGHT); break; - case SVX_SHADOW_BOTTOMLEFT: rShadow.SetLocation(SVX_SHADOW_TOPLEFT); break; + case SvxShadowLocation::BottomRight: rShadow.SetLocation(SvxShadowLocation::BottomLeft); break; + case SvxShadowLocation::TopLeft: rShadow.SetLocation(SvxShadowLocation::TopRight); break; + case SvxShadowLocation::TopRight: rShadow.SetLocation(SvxShadowLocation::BottomRight); break; + case SvxShadowLocation::BottomLeft: rShadow.SetLocation(SvxShadowLocation::TopLeft); break; default: break; } } @@ -5090,7 +5090,7 @@ void PaintCharacterBorder( 0, &rFont.GetShadowColor(), rFont.GetShadowWidth(), rFont.GetAbsShadowLocation(bVerticalLayout)); - if( aShadow.GetLocation() != SVX_SHADOW_NONE ) + if( aShadow.GetLocation() != SvxShadowLocation::NONE ) { lcl_PaintShadow( SwRect(aAlignedRect), aAlignedRect, aShadow, false, bTop, bBottom, bLeft, bRight, gProp); @@ -5423,7 +5423,7 @@ void SwFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage, } const bool bLine = rAttrs.IsLine(); - const bool bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE; + const bool bShadow = rAttrs.GetShadow().GetLocation() != SvxShadowLocation::NONE; // - flag to control, //-hack has to be used. diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 1898c05a2d29..2a4fd7421347 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -677,7 +677,7 @@ const SwRect SwFrame::UnionFrame( bool bBorder ) const nAdd += rBox.CalcLineSpace( SvxBoxItemLine::RIGHT ); else if ( rAttrs.IsBorderDist() ) nAdd += rBox.GetDistance( SvxBoxItemLine::RIGHT ) + 1; - if( rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE ) + if( rAttrs.GetShadow().GetLocation() != SvxShadowLocation::NONE ) { const SvxShadowItem &rShadow = rAttrs.GetShadow(); nLeft -= rShadow.CalcShadowSpace( SvxShadowItemSide::LEFT ); diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 8f99dea53f5f..c091ca5c881e 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -224,7 +224,7 @@ SwFont::GetAbsRightBorder( const bool bVertLayout ) const SvxShadowLocation SwFont::GetAbsShadowLocation( const bool bVertLayout ) const { - SvxShadowLocation aLocation = SVX_SHADOW_NONE; + SvxShadowLocation aLocation = SvxShadowLocation::NONE; switch( GetOrientation( bVertLayout ) ) { case 0: @@ -234,20 +234,20 @@ SvxShadowLocation SwFont::GetAbsShadowLocation( const bool bVertLayout ) const case 900: switch ( m_aShadowLocation ) { - case SVX_SHADOW_TOPLEFT: - aLocation = SVX_SHADOW_BOTTOMLEFT; + case SvxShadowLocation::TopLeft: + aLocation = SvxShadowLocation::BottomLeft; break; - case SVX_SHADOW_TOPRIGHT: - aLocation = SVX_SHADOW_TOPLEFT; + case SvxShadowLocation::TopRight: + aLocation = SvxShadowLocation::TopLeft; break; - case SVX_SHADOW_BOTTOMLEFT: - aLocation = SVX_SHADOW_BOTTOMRIGHT; + case SvxShadowLocation::BottomLeft: + aLocation = SvxShadowLocation::BottomRight; break; - case SVX_SHADOW_BOTTOMRIGHT: - aLocation = SVX_SHADOW_TOPRIGHT; + case SvxShadowLocation::BottomRight: + aLocation = SvxShadowLocation::TopRight; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: aLocation = m_aShadowLocation; break; } @@ -256,20 +256,20 @@ SvxShadowLocation SwFont::GetAbsShadowLocation( const bool bVertLayout ) const case 1800: switch ( m_aShadowLocation ) { - case SVX_SHADOW_TOPLEFT: - aLocation = SVX_SHADOW_BOTTOMRIGHT; + case SvxShadowLocation::TopLeft: + aLocation = SvxShadowLocation::BottomRight; break; - case SVX_SHADOW_TOPRIGHT: - aLocation = SVX_SHADOW_BOTTOMLEFT; + case SvxShadowLocation::TopRight: + aLocation = SvxShadowLocation::BottomLeft; break; - case SVX_SHADOW_BOTTOMLEFT: - aLocation = SVX_SHADOW_TOPRIGHT; + case SvxShadowLocation::BottomLeft: + aLocation = SvxShadowLocation::TopRight; break; - case SVX_SHADOW_BOTTOMRIGHT: - aLocation = SVX_SHADOW_TOPLEFT; + case SvxShadowLocation::BottomRight: + aLocation = SvxShadowLocation::TopLeft; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: aLocation = m_aShadowLocation; break; } @@ -278,20 +278,20 @@ SvxShadowLocation SwFont::GetAbsShadowLocation( const bool bVertLayout ) const case 2700: switch ( m_aShadowLocation ) { - case SVX_SHADOW_TOPLEFT: - aLocation = SVX_SHADOW_TOPRIGHT; + case SvxShadowLocation::TopLeft: + aLocation = SvxShadowLocation::TopRight; break; - case SVX_SHADOW_TOPRIGHT: - aLocation = SVX_SHADOW_BOTTOMRIGHT; + case SvxShadowLocation::TopRight: + aLocation = SvxShadowLocation::BottomRight; break; - case SVX_SHADOW_BOTTOMLEFT: - aLocation = SVX_SHADOW_TOPLEFT; + case SvxShadowLocation::BottomLeft: + aLocation = SvxShadowLocation::TopLeft; break; - case SVX_SHADOW_BOTTOMRIGHT: - aLocation = SVX_SHADOW_BOTTOMLEFT; + case SvxShadowLocation::BottomRight: + aLocation = SvxShadowLocation::BottomLeft; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: aLocation = m_aShadowLocation; break; } @@ -314,8 +314,8 @@ sal_uInt16 SwFont::CalcShadowSpace( switch( nShadow ) { case SvxShadowItemSide::TOP: - if(( aLoc == SVX_SHADOW_TOPLEFT || - aLoc == SVX_SHADOW_TOPRIGHT ) && + if(( aLoc == SvxShadowLocation::TopLeft || + aLoc == SvxShadowLocation::TopRight ) && ( nOrient == 0 || nOrient == 1800 || ( nOrient == 900 && !bSkipRight ) || ( nOrient == 2700 && !bSkipLeft ))) @@ -325,8 +325,8 @@ sal_uInt16 SwFont::CalcShadowSpace( break; case SvxShadowItemSide::BOTTOM: - if(( aLoc == SVX_SHADOW_BOTTOMLEFT || - aLoc == SVX_SHADOW_BOTTOMRIGHT ) && + if(( aLoc == SvxShadowLocation::BottomLeft || + aLoc == SvxShadowLocation::BottomRight ) && ( nOrient == 0 || nOrient == 1800 || ( nOrient == 900 && !bSkipLeft ) || ( nOrient == 2700 && !bSkipRight ))) @@ -336,8 +336,8 @@ sal_uInt16 SwFont::CalcShadowSpace( break; case SvxShadowItemSide::LEFT: - if(( aLoc == SVX_SHADOW_TOPLEFT || - aLoc == SVX_SHADOW_BOTTOMLEFT ) && + if(( aLoc == SvxShadowLocation::TopLeft || + aLoc == SvxShadowLocation::BottomLeft ) && ( nOrient == 900 || nOrient == 2700 || ( nOrient == 0 && !bSkipLeft ) || ( nOrient == 1800 && !bSkipRight ))) @@ -347,8 +347,8 @@ sal_uInt16 SwFont::CalcShadowSpace( break; case SvxShadowItemSide::RIGHT: - if(( aLoc == SVX_SHADOW_TOPRIGHT || - aLoc == SVX_SHADOW_BOTTOMRIGHT ) && + if(( aLoc == SvxShadowLocation::TopRight || + aLoc == SvxShadowLocation::BottomRight ) && ( nOrient == 900 || nOrient == 2700 || ( nOrient == 0 && !bSkipRight ) || ( nOrient == 1800 && !bSkipLeft ))) @@ -878,7 +878,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, { SetShadowColor(COL_TRANSPARENT); SetShadowWidth(0); - SetShadowLocation(SVX_SHADOW_NONE); + SetShadowLocation(SvxShadowLocation::NONE); } const SvxTwoLinesItem& rTwoLinesItem = pAttrSet->Get2Lines(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 14fc18c160e4..7614eaf01a4a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2748,7 +2748,7 @@ static OutputBorderOptions lcl_getTableDefaultBorderOptions(bool bEcma) rOptions.bWriteTag = true; rOptions.bWriteInsideHV = true; rOptions.bWriteDistance = false; - rOptions.aShadowLocation = SVX_SHADOW_NONE; + rOptions.aShadowLocation = SvxShadowLocation::NONE; rOptions.bCheckDistanceSize = false; return rOptions; @@ -2763,7 +2763,7 @@ static OutputBorderOptions lcl_getTableCellBorderOptions(bool bEcma) rOptions.bWriteTag = true; rOptions.bWriteInsideHV = true; rOptions.bWriteDistance = false; - rOptions.aShadowLocation = SVX_SHADOW_NONE; + rOptions.aShadowLocation = SvxShadowLocation::NONE; rOptions.bCheckDistanceSize = false; return rOptions; @@ -2778,7 +2778,7 @@ static OutputBorderOptions lcl_getBoxBorderOptions() rOptions.bWriteTag = false; rOptions.bWriteInsideHV = false; rOptions.bWriteDistance = true; - rOptions.aShadowLocation = SVX_SHADOW_NONE; + rOptions.aShadowLocation = SvxShadowLocation::NONE; rOptions.bCheckDistanceSize = false; return rOptions; @@ -2838,11 +2838,11 @@ static void impl_borders( FSHelperPtr const & pSerializer, const SvxBoxItem& rBo } bool bWriteShadow = false; - if (rOptions.aShadowLocation == SVX_SHADOW_NONE) + if (rOptions.aShadowLocation == SvxShadowLocation::NONE) { // The border has no shadow } - else if (rOptions.aShadowLocation == SVX_SHADOW_BOTTOMRIGHT) + else if (rOptions.aShadowLocation == SvxShadowLocation::BottomRight) { // Special case of 'Bottom-Right' shadow: // If the shadow location is 'Bottom-Right' - then turn on the shadow @@ -2857,10 +2857,10 @@ static void impl_borders( FSHelperPtr const & pSerializer, const SvxBoxItem& rBo // If there is a shadow, and it's not the regular 'Bottom-Right', // then write only the 'shadowed' sides of the border if ( - ( ( rOptions.aShadowLocation == SVX_SHADOW_TOPLEFT || rOptions.aShadowLocation == SVX_SHADOW_TOPRIGHT ) && *pBrd == SvxBoxItemLine::TOP ) || - ( ( rOptions.aShadowLocation == SVX_SHADOW_TOPLEFT || rOptions.aShadowLocation == SVX_SHADOW_BOTTOMLEFT ) && *pBrd == SvxBoxItemLine::LEFT ) || - ( ( rOptions.aShadowLocation == SVX_SHADOW_BOTTOMLEFT || rOptions.aShadowLocation == SVX_SHADOW_BOTTOMRIGHT ) && *pBrd == SvxBoxItemLine::BOTTOM) || - ( ( rOptions.aShadowLocation == SVX_SHADOW_TOPRIGHT || rOptions.aShadowLocation == SVX_SHADOW_BOTTOMRIGHT ) && *pBrd == SvxBoxItemLine::RIGHT ) + ( ( rOptions.aShadowLocation == SvxShadowLocation::TopLeft || rOptions.aShadowLocation == SvxShadowLocation::TopRight ) && *pBrd == SvxBoxItemLine::TOP ) || + ( ( rOptions.aShadowLocation == SvxShadowLocation::TopLeft || rOptions.aShadowLocation == SvxShadowLocation::BottomLeft ) && *pBrd == SvxBoxItemLine::LEFT ) || + ( ( rOptions.aShadowLocation == SvxShadowLocation::BottomLeft || rOptions.aShadowLocation == SvxShadowLocation::BottomRight ) && *pBrd == SvxBoxItemLine::BOTTOM) || + ( ( rOptions.aShadowLocation == SvxShadowLocation::TopRight || rOptions.aShadowLocation == SvxShadowLocation::BottomRight ) && *pBrd == SvxBoxItemLine::RIGHT ) ) { bWriteShadow = true; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index a870c1765a3e..4cb05b0b470b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -87,7 +87,7 @@ struct OutputBorderOptions SvxShadowLocation aShadowLocation; bool bCheckDistanceSize; - OutputBorderOptions() : tag(0), bUseStartEnd(false), bWriteTag(true), bWriteInsideHV(false), bWriteDistance(false), aShadowLocation(SVX_SHADOW_NONE), bCheckDistanceSize(false) {} + OutputBorderOptions() : tag(0), bUseStartEnd(false), bWriteTag(true), bWriteInsideHV(false), bWriteDistance(false), aShadowLocation(SvxShadowLocation::NONE), bCheckDistanceSize(false) {} }; /** diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 4a71fe2c2506..c4b2e8b63dc1 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -298,25 +298,25 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons // Count effectExtent values, their value is needed before dist{T,B,L,R} is written. SvxShadowItem aShadowItem = pFrameFormat->GetShadow(); sal_Int32 nLeftExt = 0, nRightExt = 0, nTopExt = 0, nBottomExt = 0; - if (aShadowItem.GetLocation() != SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() != SvxShadowLocation::NONE) { sal_Int32 nShadowWidth(TwipsToEMU(aShadowItem.GetWidth())); switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: nTopExt = nLeftExt = nShadowWidth; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: nTopExt = nRightExt = nShadowWidth; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: nBottomExt = nLeftExt = nShadowWidth; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: nBottomExt = nRightExt = nShadowWidth; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } } @@ -882,27 +882,27 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFo void DocxSdrExport::Impl::textFrameShadow(const SwFrameFormat& rFrameFormat) { const SvxShadowItem& aShadowItem = rFrameFormat.GetShadow(); - if (aShadowItem.GetLocation() == SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() == SvxShadowLocation::NONE) return; OString aShadowWidth(OString::number(double(aShadowItem.GetWidth()) / 20) + "pt"); OString aOffset; switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: aOffset = "-" + aShadowWidth + ",-" + aShadowWidth; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: aOffset = aShadowWidth + ",-" + aShadowWidth; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: aOffset = "-" + aShadowWidth + "," + aShadowWidth; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: aOffset = aShadowWidth + "," + aShadowWidth; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } if (aOffset.isEmpty()) @@ -985,7 +985,7 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) const SvxShadowItem& aShadowItem = rFrameFormat.GetShadow(); // Output effects - if (aShadowItem.GetLocation() != SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() != SvxShadowLocation::NONE) { // Distance is measured diagonally from corner double nShadowDist = sqrt((double)aShadowItem.GetWidth()*aShadowItem.GetWidth()*2.0); @@ -995,20 +995,20 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) sal_uInt32 nShadowDir = 0; switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: nShadowDir = 13500000; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: nShadowDir = 18900000; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: nShadowDir = 8100000; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: nShadowDir = 2700000; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } OString aShadowDir(OString::number(nShadowDir)); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index b56eeefc696a..6d790ce9dee6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -164,13 +164,13 @@ static OString OutTBLBorderLine(RtfExport& rExport, const editeng::SvxBorderLine } static OString OutBorderLine(RtfExport& rExport, const editeng::SvxBorderLine* pLine, - const sal_Char* pStr, sal_uInt16 nDist, SvxShadowLocation eShadowLocation = SVX_SHADOW_NONE) + const sal_Char* pStr, sal_uInt16 nDist, SvxShadowLocation eShadowLocation = SvxShadowLocation::NONE) { OStringBuffer aRet; aRet.append(OutTBLBorderLine(rExport, pLine, pStr)); aRet.append(OOO_STRING_SVTOOLS_RTF_BRSP); aRet.append((sal_Int32)nDist); - if (eShadowLocation == SVX_SHADOW_BOTTOMRIGHT) + if (eShadowLocation == SvxShadowLocation::BottomRight) aRet.append(LO_STRING_SVTOOLS_RTF_BRDRSH); return aRet.makeStringAndClear(); } @@ -1685,7 +1685,7 @@ namespace void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrameFormat& rFrameFormat) { const SvxShadowItem& aShadowItem = rFrameFormat.GetShadow(); - if (aShadowItem.GetLocation() == SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() == SvxShadowLocation::NONE) return; rFlyProperties.push_back(std::make_pair<OString, OString>("fShadow", OString::number(1))); @@ -1700,24 +1700,24 @@ void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyPropert OString aOffsetY; switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: aOffsetX = "-" + aShadowWidth; aOffsetY = "-" + aShadowWidth; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: aOffsetX = aShadowWidth; aOffsetY = "-" + aShadowWidth; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: aOffsetX = "-" + aShadowWidth; aOffsetY = aShadowWidth; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: aOffsetX = aShadowWidth; aOffsetY = aShadowWidth; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } if (!aOffsetX.isEmpty()) @@ -2606,7 +2606,7 @@ void RtfAttributeOutput::CharHidden(const SvxCharHiddenItem& rHidden) void RtfAttributeOutput::CharBorder(const editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow) { - m_aStyles.append(OutBorderLine(m_rExport, pAllBorder, OOO_STRING_SVTOOLS_RTF_CHBRDR, nDist, bShadow ? SVX_SHADOW_BOTTOMRIGHT : SVX_SHADOW_NONE)); + m_aStyles.append(OutBorderLine(m_rExport, pAllBorder, OOO_STRING_SVTOOLS_RTF_CHBRDR, nDist, bShadow ? SvxShadowLocation::BottomRight : SvxShadowLocation::NONE)); } void RtfAttributeOutput::CharHighlight(const SvxBrushItem& rBrush) @@ -3302,7 +3302,7 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox) m_aSectionBreaks.append(OutBorderLine(m_rExport, rBox.GetTop(), OOO_STRING_SVTOOLS_RTF_BOX, nDist)); else { - SvxShadowLocation eShadowLocation = SVX_SHADOW_NONE; + SvxShadowLocation eShadowLocation = SvxShadowLocation::NONE; if (const SfxPoolItem* pItem = GetExport().HasItem(RES_SHADOW)) eShadowLocation = static_cast<const SvxShadowItem*>(pItem)->GetLocation(); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 3b7707d267d5..b6d7771cdcbe 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2085,27 +2085,27 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat, sal_uInt32 nShadow = nShadowType; SvxShadowLocation eLocation = pSI->GetLocation(); - if( (eLocation!=SVX_SHADOW_NONE) && (pSI->GetWidth()!=0) ) + if( (eLocation!=SvxShadowLocation::NONE) && (pSI->GetWidth()!=0) ) { switch( eLocation ) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: { nOffX = -nOffX; nOffY = -nOffY; } break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: { nOffY = -nOffY; } break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: { nOffX = -nOffX; } break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: break; default: break; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 04c30bc3e7a0..166a078dcf39 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -529,7 +529,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, bool bShadow = false; // Shadow ? if (const SvxShadowItem* pSI = rAttrSet.GetItem<SvxShadowItem>(RES_SHADOW)) { - bShadow = (pSI->GetLocation() != SVX_SHADOW_NONE) && + bShadow = (pSI->GetLocation() != SvxShadowLocation::NONE) && (pSI->GetWidth() != 0); } diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index bc00c9bfeca6..e463164a4077 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4121,7 +4121,7 @@ void WW8AttributeOutput::FormatBox( const SvxBoxItem& rBox ) if ( pItem ) { const SvxShadowItem* p = static_cast<const SvxShadowItem*>(pItem); - bShadow = ( p->GetLocation() != SVX_SHADOW_NONE ) + bShadow = ( p->GetLocation() != SvxShadowLocation::NONE ) && ( p->GetWidth() != 0 ); } @@ -5116,7 +5116,7 @@ void AttributeOutputBase::FormatCharBorder( const SvxBoxItem& rBox ) const SfxPoolItem* pItem = GetExport().HasItem( RES_CHRATR_SHADOW ); const SvxShadowItem* pShadowItem = static_cast<const SvxShadowItem*>(pItem); const bool bShadow = - pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE && + pShadowItem && pShadowItem->GetLocation() != SvxShadowLocation::NONE && pShadowItem->GetWidth() > 0; CharBorder( pBorderLine, nDist, bShadow ); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 1ad44eb97329..7ab52cf733cb 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1758,16 +1758,16 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, if( 0 <= nShdDistX ) { if( 0 <= nShdDistY ) - eShdPosi = SVX_SHADOW_BOTTOMRIGHT; + eShdPosi = SvxShadowLocation::BottomRight; else - eShdPosi = SVX_SHADOW_TOPRIGHT; + eShdPosi = SvxShadowLocation::TopRight; } else { if( 0 <= nShdDistY ) - eShdPosi = SVX_SHADOW_BOTTOMLEFT; + eShdPosi = SvxShadowLocation::BottomLeft; else - eShdPosi = SVX_SHADOW_TOPLEFT; + eShdPosi = SvxShadowLocation::TopLeft; } aShadow.SetLocation( eShdPosi ); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index dbe11d3d7e75..57ac9b2c7ed3 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1436,7 +1436,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, if (nVal < 0x10) nVal = 0x10; rShadow.SetWidth(nVal); - rShadow.SetLocation(SVX_SHADOW_BOTTOMRIGHT); + rShadow.SetLocation(SvxShadowLocation::BottomRight); bRet = true; } return bRet; diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 58f8de8111a8..59be80af8307 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -500,19 +500,19 @@ bool SvXMLExportItemMapper::QueryXMLValue( sal_Int32 nX = 1, nY = 1; switch( pShadow->GetLocation() ) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: nX = -1; nY = -1; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: nY = -1; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: nX = -1; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: break; - case SVX_SHADOW_NONE: + case SvxShadowLocation::NONE: default: rValue = GetXMLToken(XML_NONE); return true; diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index b695f721786c..e9af97b7634b 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -360,14 +360,14 @@ bool SvXMLImportItemMapper::PutXMLValue( SvXMLTokenEnumerator aTokenEnum( rValue ); Color aColor( 128,128, 128 ); - rShadow.SetLocation( SVX_SHADOW_BOTTOMRIGHT ); + rShadow.SetLocation( SvxShadowLocation::BottomRight ); OUString aToken; while( aTokenEnum.getNextToken( aToken ) ) { if( IsXMLToken( aToken, XML_NONE ) ) { - rShadow.SetLocation( SVX_SHADOW_NONE ); + rShadow.SetLocation( SvxShadowLocation::NONE ); bOk = true; } else if( !bColorFound && aToken.startsWith("#") ) @@ -394,22 +394,22 @@ bool SvXMLImportItemMapper::PutXMLValue( { if( nY < 0 ) { - rShadow.SetLocation( SVX_SHADOW_TOPLEFT ); + rShadow.SetLocation( SvxShadowLocation::TopLeft ); } else { - rShadow.SetLocation( SVX_SHADOW_BOTTOMLEFT ); + rShadow.SetLocation( SvxShadowLocation::BottomLeft ); } } else { if( nY < 0 ) { - rShadow.SetLocation( SVX_SHADOW_TOPRIGHT ); + rShadow.SetLocation( SvxShadowLocation::TopRight ); } else { - rShadow.SetLocation( SVX_SHADOW_BOTTOMRIGHT ); + rShadow.SetLocation( SvxShadowLocation::BottomRight ); } } |