diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-04-30 01:57:43 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-04-30 11:51:17 +0000 |
| commit | c675a2d669c191f3b18ae006c78ef83efba14c30 (patch) | |
| tree | c8fd1a6efd7d5ba73d97159180a779d73f3f46ff /xmloff/source/draw | |
| parent | ca37fcec558414ff44fb61358406ad08fe6ea5bd (diff) | |
xmloff: simplify code by using std::all_of/std::any_of/std::none_of
Change-Id: I87311d8989c23538983d45ad9b12a64080441d78
Reviewed-on: https://gerrit.libreoffice.org/15569
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index bcca5b8af057..3473e5784515 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -32,6 +32,7 @@ #include <xmloff/maptype.hxx> #include "XMLShapePropertySetContext.hxx" +#include <algorithm> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -149,8 +150,8 @@ void XMLGraphicsDefaultStyle::SetDefaults() ->getPropertySetMapper()); sal_Int32 const nStrokeIndex( pImpPrMap->GetEntryIndex(XML_NAMESPACE_SVG, "stroke-color", 0)); - if (std::find_if(GetProperties().begin(), GetProperties().end(), - XMLPropertyByIndex(nStrokeIndex)) == GetProperties().end()) + if (std::none_of(GetProperties().begin(), GetProperties().end(), + XMLPropertyByIndex(nStrokeIndex))) { sal_Int32 const nStroke( (bIsAOO4) ? RGB_COLORDATA(128, 128, 128) : COL_BLACK); @@ -160,8 +161,8 @@ void XMLGraphicsDefaultStyle::SetDefaults() ? RGB_COLORDATA(0xCF, 0xE7, 0xF5) : RGB_COLORDATA(153, 204, 255)); sal_Int32 const nFillIndex( pImpPrMap->GetEntryIndex(XML_NAMESPACE_DRAW, "fill-color", 0)); - if (std::find_if(GetProperties().begin(), GetProperties().end(), - XMLPropertyByIndex(nFillIndex)) == GetProperties().end()) + if (std::none_of(GetProperties().begin(), GetProperties().end(), + XMLPropertyByIndex(nFillIndex))) { xDefaults->setPropertyValue("FillColor", makeAny(nFillColor)); } @@ -169,8 +170,8 @@ void XMLGraphicsDefaultStyle::SetDefaults() { sal_Int32 const nFill2Index(pImpPrMap->GetEntryIndex( XML_NAMESPACE_DRAW, "secondary-fill-color", 0)); - if (std::find_if(GetProperties().begin(), GetProperties().end(), - XMLPropertyByIndex(nFill2Index)) == GetProperties().end()) + if (std::none_of(GetProperties().begin(), GetProperties().end(), + XMLPropertyByIndex(nFill2Index))) { xDefaults->setPropertyValue("FillColor2", makeAny(nFillColor)); } |