diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-29 10:05:16 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-31 06:57:10 +0100 |
| commit | df16e70378cdc80b3e4c1327704a2781a4c57992 (patch) | |
| tree | 5a9c64fc01844ec0307642aea1dbc108b52c6834 /slideshow/source/engine/shapes/gdimtftools.cxx | |
| parent | 8b9e502480812f61a1c8d37c465aaf93763fe156 (diff) | |
Prepare for removal of non-const operator[] from Sequence in slideshow
Change-Id: Ic3d4835a6153ce3451e5ddf7a74310ea2b70da2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124389
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'slideshow/source/engine/shapes/gdimtftools.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 0f8644cd3da8..6a803f757711 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -29,6 +29,7 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/fileformat.h> +#include <comphelper/propertyvalue.hxx> #include <vcl/canvastools.hxx> #include <vcl/metaact.hxx> @@ -174,29 +175,22 @@ GDIMetaFileSharedPtr getMetaFile( const uno::Reference< lang::XComponent >& uno::Reference< drawing::XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create(rxContext); - uno::Sequence< beans::PropertyValue > aProps(3); - aProps[0].Name = "FilterName"; - aProps[0].Value <<= OUString("SVM"); - - aProps[1].Name = "GraphicRenderer"; - aProps[1].Value <<= uno::Reference< graphic::XGraphicRenderer >(xRenderer); - - uno::Sequence< beans::PropertyValue > aFilterData(4); - aFilterData[0].Name = "ScrollText"; - aFilterData[0].Value <<= ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0); - - aFilterData[1].Name = "ExportOnlyBackground"; - aFilterData[1].Value <<= ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0); - - aFilterData[2].Name = "Version"; - aFilterData[2].Value <<= static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 ); - - aFilterData[3].Name = "CurrentPage"; - aFilterData[3].Value <<= uno::Reference< uno::XInterface >( xContainingPage, - uno::UNO_QUERY_THROW ); - - aProps[2].Name = "FilterData"; - aProps[2].Value <<= aFilterData; + uno::Sequence< beans::PropertyValue > aFilterData{ + comphelper::makePropertyValue("ScrollText", + ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0)), + comphelper::makePropertyValue("ExportOnlyBackground", + ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0)), + comphelper::makePropertyValue("Version", static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 )), + comphelper::makePropertyValue( + "CurrentPage", uno::Reference< uno::XInterface >( xContainingPage, + uno::UNO_QUERY_THROW )) + }; + + uno::Sequence< beans::PropertyValue > aProps{ + comphelper::makePropertyValue("FilterName", OUString("SVM")), + comphelper::makePropertyValue("GraphicRenderer", uno::Reference< graphic::XGraphicRenderer >(xRenderer)), + comphelper::makePropertyValue("FilterData", aFilterData) + }; xExporter->setSourceDocument( xSource ); if( !xExporter->filter( aProps ) ) |