diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-24 20:11:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-25 06:11:27 +0000 |
| commit | a82805f8f97eeb6acadd7806cdb7120bed45a376 (patch) | |
| tree | 213a2cae70d328a9e78bae7081a6dfa4025d95f1 /chart2/source/view/main/ShapeFactory.cxx | |
| parent | 2b68383e44338ffc3d5fb519fd91ff31f0a2b35a (diff) | |
Kill comphelper::MakeMap
Change-Id: I97e9e79ef51e3d78f01b831dd3eee91218058823
Reviewed-on: https://gerrit.libreoffice.org/24344
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2/source/view/main/ShapeFactory.cxx')
| -rw-r--r-- | chart2/source/view/main/ShapeFactory.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index fe022f0613ce..be3064fbc286 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -24,7 +24,6 @@ #include "macros.hxx" #include "RelativeSizeHelper.hxx" #include "PropertyMapper.hxx" -#include <comphelper/InlineContainer.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/CircleKind.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> @@ -2268,8 +2267,9 @@ uno::Reference< drawing::XShape > tPropertyNameValueMap aValueMap; //fill line-, fill- and paragraph-properties into the ValueMap { - tMakePropertyNameMap aNameMap = PropertyMapper::getPropertyNameMapForParagraphProperties(); - aNameMap( PropertyMapper::getPropertyNameMapForFillAndLineProperties() ); + tPropertyNameMap aNameMap = PropertyMapper::getPropertyNameMapForParagraphProperties(); + auto const & add = PropertyMapper::getPropertyNameMapForFillAndLineProperties(); + aNameMap.insert(add.begin(), add.end()); PropertyMapper::getValueMap( aValueMap, aNameMap, xTextProperties ); } |