diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-05-22 14:16:01 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-05-25 03:58:52 +0200 |
| commit | 8e87f1f2ff4df763e29bdc097786230c6293744b (patch) | |
| tree | 5eb4bccc592f6c9e3c892911ee2c5b824a28becb /cui | |
| parent | 68c4d1ca207a82015120a770fbbc5c12fbe1abda (diff) | |
svx: change NamedColor be a struct instead of std::pair
Change-Id: Ice1625e8cae8da859ea8a940b3f8e40f6f9d7037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152235
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/tphatch.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 1a35114739fc..879e68a0462c 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -245,7 +245,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) if (m_xCbBackgroundColor->get_active()) { NamedColor aColor = m_xLbBackgroundColor->GetSelectedEntry(); - rSet->Put(XFillColorItem(aColor.second, aColor.first)); + rSet->Put(XFillColorItem(aColor.m_aName, aColor.m_aColor)); } return true; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 06e95d3fdcaf..d150767daf37 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -457,7 +457,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) if (m_xLbColor->IsValueChangedFromSaved()) { NamedColor aColor = m_xLbColor->GetSelectedEntry(); - XLineColorItem aItem(aColor.second, aColor.first); + XLineColorItem aItem(aColor.m_aName, aColor.m_aColor); pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR ); if ( !pOld || !( *static_cast<const XLineColorItem*>(pOld) == aItem ) ) { @@ -759,7 +759,7 @@ void SvxLineTabPage::FillXLSet_Impl() m_rXLSet.Put( XLineWidthItem( GetCoreValue( *m_xMtrLineWidth, m_ePoolUnit ) ) ); NamedColor aColor = m_xLbColor->GetSelectedEntry(); - m_rXLSet.Put(XLineColorItem(aColor.second, aColor.first)); + m_rXLSet.Put(XLineColorItem(aColor.m_aName, aColor.m_aColor)); // Centered line end if( m_xTsbCenterStart->get_state() == TRISTATE_TRUE ) |