slideshow/source/engine/shapes/gdimtftools.cxx | 40 +++++---------
slideshow/source/engine/shapes/viewmediashape.cxx | 10 ++-
slideshow/source/engine/slide/targetpropertiescreator.cxx | 3 -
smoketest/smoketest.cxx | 19 +++---
4 files changed, 35 insertions(+), 37 deletions(-)
New commits:
commit d07c4fe7681d90f20c4c0dafefc3439e8265e734
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Oct 29 10:06:09 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Oct 31 06:57:21 2021 +0100
Prepare for removal of non-const operator[] from Sequence in smoketest
Change-Id: Ica192dfb16716b4fb38d59eee0a39c6dd411b6a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124390
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index a60f58167f66..80a29036f19b 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -140,15 +140,16 @@ void Test::test() {
CPPUNIT_ASSERT(
test::getTestArgument(
u"smoketest.doc", &doc));
- css::uno::Sequence< css::beans::PropertyValue > args(2);
- args[0].Name = "MacroExecutionMode";
- args[0].Handle = -1;
- args[0].Value <<= css::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
- args[0].State = css::beans::PropertyState_DIRECT_VALUE;
- args[1].Name = "ReadOnly";
- args[1].Handle = -1;
- args[1].Value <<= true;
- args[1].State = css::beans::PropertyState_DIRECT_VALUE;
+ css::uno::Sequence< css::beans::PropertyValue > args{
+ { /* Name */ "MacroExecutionMode",
+ /* Handle */ -1,
+ /* Value */
css::uno::Any(css::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN),
+ /* State */ css::beans::PropertyState_DIRECT_VALUE },
+ { /* Name */ "ReadOnly",
+ /* Handle */ -1,
+ /* Value */ css::uno::Any(true),
+ /* State */ css::beans::PropertyState_DIRECT_VALUE }
+ };
css::util::URL url;
url.Complete =
"vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?"
"language=Basic&location=document";
commit df16e70378cdc80b3e4c1327704a2781a4c57992
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Oct 29 10:05:16 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Oct 31 06:57:10 2021 +0100
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.kagan...@collabora.com>
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 ) )
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx
b/slideshow/source/engine/shapes/viewmediashape.cxx
index 2179f71ba78c..52a86be889d7 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -433,17 +433,19 @@ namespace slideshow::internal
if( mxPlayer.is() )
{
- uno::Sequence< uno::Any > aArgs( 3 );
sal_IntPtr nParentWindowHandle(0);
const SystemEnvData* pEnvData =
mpMediaWindow->GetSystemData();
// tdf#139609 gtk doesn't need the handle, and
fetching it is undesirable
if (!pEnvData || pEnvData->toolkit !=
SystemEnvData::Toolkit::Gtk)
nParentWindowHandle =
mpMediaWindow->GetParentWindowHandle();
- aArgs[ 0 ] <<= nParentWindowHandle;
aAWTRect.X = aAWTRect.Y = 0;
- aArgs[ 1 ] <<= aAWTRect;
- aArgs[ 2 ] <<= reinterpret_cast< sal_IntPtr >(
mpMediaWindow.get() );
+
+ uno::Sequence< uno::Any > aArgs{
+ uno::Any(nParentWindowHandle),
+ uno::Any(aAWTRect),
+ uno::Any(reinterpret_cast< sal_IntPtr >(
mpMediaWindow.get() ))
+ };
mxPlayerWindow.set( mxPlayer->createPlayerWindow(
aArgs ) );
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx
b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index b159bc6c2778..035b6e6e1a98 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -340,11 +340,12 @@ namespace slideshow::internal
// output to result sequence
uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size()
);
+ auto aResRange = asNonConstRange(aRes);
::std::size_t nCurrIndex(0);
for( const auto& rIter : aShapeHash )
{
- animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] );
+ animations::TargetProperties& rCurrProps( aResRange[ nCurrIndex++
] );
if( rIter.first.mnParagraphIndex == -1 )
{
