summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/tpgradnt.cxx13
-rw-r--r--cui/source/tabpages/tptrans.cxx8
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx13
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx13
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx9
5 files changed, 26 insertions, 30 deletions
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index d3d066236ae1..37c56da9aefc 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -551,8 +551,7 @@ void SvxGradientTabPage::ChangeGradientHdl_Impl()
// MCGR: preserve ColorStops if given.
// tdf#155901 We need offset of first and last stop, so include them.
if (pGradient->GetColorStops().size() >= 2)
- m_aColorStops = basegfx::BColorStops(pGradient->GetColorStops().begin(),
- pGradient->GetColorStops().end());
+ m_aColorStops = pGradient->GetColorStops();
else
m_aColorStops.clear();
@@ -645,11 +644,11 @@ basegfx::BColorStops SvxGradientTabPage::createColorStops()
if(m_aColorStops.size() >= 2)
{
- aColorStops.emplace_back(m_aColorStops.front().getStopOffset(),
- m_xLbColorFrom->GetSelectEntryColor().getBColor());
- aColorStops.insert(aColorStops.begin(), m_aColorStops.begin() + 1, m_aColorStops.end() - 1);
- aColorStops.emplace_back(m_aColorStops.back().getStopOffset(),
- m_xLbColorTo->GetSelectEntryColor().getBColor());
+ aColorStops = m_aColorStops;
+ aColorStops.front() = basegfx::BColorStop(m_aColorStops.front().getStopOffset(),
+ m_xLbColorFrom->GetSelectEntryColor().getBColor());
+ aColorStops.back() = basegfx::BColorStop(m_aColorStops.back().getStopOffset(),
+ m_xLbColorTo->GetSelectEntryColor().getBColor());
}
else
{
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 3d157850a526..04cbdfb6b24a 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -370,7 +370,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs)
// MCGR: preserve ColorStops if given
// tdf#155901 We need offset of first and last stop, so include them.
if (rGradient.GetColorStops().size() >= 2)
- maColorStops = basegfx::BColorStops(rGradient.GetColorStops().begin(), rGradient.GetColorStops().end());
+ maColorStops = rGradient.GetColorStops();
else
maColorStops.clear();
@@ -519,9 +519,9 @@ basegfx::BColorStops SvxTransparenceTabPage::createColorStops()
if(maColorStops.size() >= 2)
{
- aColorStops.emplace_back(maColorStops.front().getStopOffset(), aStartBColor);
- aColorStops.insert(aColorStops.begin(), maColorStops.begin() + 1, maColorStops.end() - 1);
- aColorStops.emplace_back(maColorStops.back().getStopOffset(), aEndBColor);
+ aColorStops = maColorStops;
+ aColorStops.front() = basegfx::BColorStop(maColorStops.front().getStopOffset(), aStartBColor);
+ aColorStops.back() = basegfx::BColorStop(maColorStops.back().getStopOffset(), aEndBColor);
}
else
{
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index dd2a0f491418..ebdbf0977505 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -406,8 +406,7 @@ void SlideBackground::Update()
// MCGR: preserve ColorStops if given.
// tdf#155901 We need offset of first and last stop, so include them.
if (aBGradient.GetColorStops().size() >= 2)
- maColorStops = basegfx::BColorStops(aBGradient.GetColorStops().begin(),
- aBGradient.GetColorStops().end());
+ maColorStops = aBGradient.GetColorStops();
else
maColorStops.clear();
}
@@ -1293,11 +1292,11 @@ basegfx::BColorStops SlideBackground::createColorStops()
if (maColorStops.size() >= 2)
{
- aColorStops.emplace_back(maColorStops.front().getStopOffset(),
- mxFillGrad1->GetSelectEntryColor().getBColor());
- aColorStops.insert(aColorStops.begin(), maColorStops.begin() + 1, maColorStops.end() - 1);
- aColorStops.emplace_back(maColorStops.back().getStopOffset(),
- mxFillGrad2->GetSelectEntryColor().getBColor());
+ aColorStops = maColorStops;
+ aColorStops.front() = basegfx::BColorStop(maColorStops.front().getStopOffset(),
+ mxFillGrad1->GetSelectEntryColor().getBColor());
+ aColorStops.back() = basegfx::BColorStop(maColorStops.back().getStopOffset(),
+ mxFillGrad2->GetSelectEntryColor().getBColor());
}
else
{
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index b84f5a45244e..582d4536d981 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -491,8 +491,7 @@ void AreaPropertyPanelBase::FillStyleChanged(bool bUpdateModel)
// MCGR: preserve ColorStops if given
// tdf#155901 We need offset of first and last stop, so include them.
if (aGradient.GetColorStops().size() >= 2)
- maColorStops = basegfx::BColorStops(aGradient.GetColorStops().begin(),
- aGradient.GetColorStops().end());
+ maColorStops = aGradient.GetColorStops();
else
maColorStops.clear();
@@ -1375,11 +1374,11 @@ basegfx::BColorStops AreaPropertyPanelBase::createColorStops()
if (maColorStops.size() >= 2)
{
- aColorStops.emplace_back(maColorStops.front().getStopOffset(),
- mxLbFillGradFrom->GetSelectEntryColor().getBColor());
- aColorStops.insert(aColorStops.begin(), maColorStops.begin() + 1, maColorStops.end() - 1);
- aColorStops.emplace_back(maColorStops.back().getStopOffset(),
- mxLbFillGradTo->GetSelectEntryColor().getBColor());
+ aColorStops = maColorStops;
+ aColorStops.front() = basegfx::BColorStop(maColorStops.front().getStopOffset(),
+ mxLbFillGradFrom->GetSelectEntryColor().getBColor());
+ aColorStops.back() = basegfx::BColorStop(maColorStops.back().getStopOffset(),
+ mxLbFillGradTo->GetSelectEntryColor().getBColor());
}
else
{
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index 6a717551e456..680cf2cfc4ee 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -87,8 +87,7 @@ void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem const
// MCGR: preserve ColorStops if given
// tdf#155901 We need offset of first and last stop, so include them.
if (aGradient.GetColorStops().size() >= 2)
- maColorStops = basegfx::BColorStops(aGradient.GetColorStops().begin(),
- aGradient.GetColorStops().end());
+ maColorStops = aGradient.GetColorStops();
else
maColorStops.clear();
@@ -142,9 +141,9 @@ void AreaTransparencyGradientPopup::ExecuteValueModify()
if (maColorStops.size() >= 2)
{
- aColorStops.emplace_back(maColorStops.front().getStopOffset(), aStartBColor);
- aColorStops.insert(aColorStops.begin(), maColorStops.begin() + 1, maColorStops.end() - 1);
- aColorStops.emplace_back(maColorStops.back().getStopOffset(), aEndBColor);
+ aColorStops = maColorStops;
+ aColorStops.front() = basegfx::BColorStop(maColorStops.front().getStopOffset(), aStartBColor);
+ aColorStops.back() = basegfx::BColorStop(maColorStops.back().getStopOffset(), aEndBColor);
}
else
{
generated by cgit (git 2.34.1) at 2024-07-01 02:24:43 +0000