editeng/source/items/textitem.cxx | 26 +++++++++++++------------- include/editeng/colritem.hxx | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit b9050dae2c9a438277973c674b7d5695a042fea3 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Sun Dec 7 00:09:30 2025 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Dec 8 06:57:37 2025 +0100 SvxColorItem: rename mColor to maColor Change-Id: If4b7a0688f57acfc38e24742e8c0dae4354110be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195170 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 76754ca005ad..8e5153b961ba 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1541,19 +1541,19 @@ bool SvxContourItem::GetPresentation // class SvxColorItem ---------------------------------------------------- SvxColorItem::SvxColorItem( const sal_uInt16 nId ) : SfxPoolItem(nId), - mColor( COL_BLACK ) + maColor( COL_BLACK ) { } SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) : SfxPoolItem( nId ), - mColor( rCol ) + maColor( rCol ) { } SvxColorItem::SvxColorItem(Color const& rColor, model::ComplexColor const& rComplexColor, const sal_uInt16 nId) : SfxPoolItem(nId) - , mColor(rColor) + , maColor(rColor) , maComplexColor(rComplexColor) { } @@ -1567,14 +1567,14 @@ bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const assert(SfxPoolItem::operator==(rAttr)); const SvxColorItem& rColorItem = static_cast<const SvxColorItem&>(rAttr); - return mColor == rColorItem.mColor && + return maColor == rColorItem.maColor && maComplexColor == rColorItem.maComplexColor; } size_t SvxColorItem::hashCode() const { std::size_t seed(0); - o3tl::hash_combine(seed, static_cast<sal_Int32>(mColor)); + o3tl::hash_combine(seed, static_cast<sal_Int32>(maColor)); o3tl::hash_combine(seed, maComplexColor); return seed; } @@ -1586,13 +1586,13 @@ bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { case MID_COLOR_ALPHA: { - auto fTransparency = static_cast<double>(255 - mColor.GetAlpha()) * 100 / 255; + auto fTransparency = static_cast<double>(255 - maColor.GetAlpha()) * 100 / 255; rVal <<= static_cast<sal_Int16>(basegfx::fround(fTransparency)); break; } case MID_GRAPHIC_TRANSPARENT: { - rVal <<= mColor.GetAlpha() == 0; + rVal <<= maColor.GetAlpha() == 0; break; } case MID_COLOR_THEME_INDEX: @@ -1649,7 +1649,7 @@ bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_COLOR_RGB: default: { - rVal <<= mColor; + rVal <<= maColor; break; } } @@ -1669,13 +1669,13 @@ bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if (bRet) { auto fTransparency = static_cast<double>(nTransparency) * 255 / 100; - mColor.SetAlpha(255 - static_cast<sal_uInt8>(basegfx::fround(fTransparency))); + maColor.SetAlpha(255 - static_cast<sal_uInt8>(basegfx::fround(fTransparency))); } return bRet; } case MID_GRAPHIC_TRANSPARENT: { - mColor.SetAlpha( Any2Bool( rVal ) ? 0 : 255 ); + maColor.SetAlpha( Any2Bool( rVal ) ? 0 : 255 ); return true; } case MID_COLOR_THEME_INDEX: @@ -1749,7 +1749,7 @@ bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_COLOR_RGB: default: { - if (!(rVal >>= mColor)) + if (!(rVal >>= maColor)) return false; } break; @@ -1770,7 +1770,7 @@ bool SvxColorItem::GetPresentation OUString& rText, const IntlWrapper& /*rIntl*/ ) const { - rText = ::GetColorString( mColor ); + rText = ::GetColorString( maColor ); return true; } @@ -1780,7 +1780,7 @@ void SvxColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); std::stringstream ss; - ss << mColor; + ss << maColor; (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(ss.str().c_str())); OUString aStr; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 57188716ce99..344ca81a78df 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -31,7 +31,7 @@ class EDITENG_DLLPUBLIC SvxColorItem final : public SfxPoolItem { private: - Color mColor; + Color maColor; model::ComplexColor maComplexColor; public: @@ -59,22 +59,22 @@ public: const Color& GetValue() const { - return mColor; + return maColor; } void SetValue(const Color& rNewColor) { ASSERT_CHANGE_REFCOUNTED_ITEM; - mColor = rNewColor; + maColor = rNewColor; } const Color& getColor() const { - return mColor; + return maColor; } void setColor(const Color& rNewColor) { ASSERT_CHANGE_REFCOUNTED_ITEM; - mColor = rNewColor; + maColor = rNewColor; } model::ComplexColor const& getComplexColor() const { return maComplexColor; }
