[Libreoffice-commits] core.git: avmedia/source

[Mike Kaganski (via logerrit)]

 avmedia/source/framework/mediaitem.cxx     |   22 ++++++++++------------
 avmedia/source/viewer/mediawindow_impl.cxx |    9 +++++----
 2 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit eee0b76a8c3dab62d1751db2f29f7f075c65b0c5
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Oct 28 16:02:46 2021 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Oct 28 20:09:59 2021 +0200

    Prepare for removal of non-const operator[] from Sequence in avmedia
    
    Change-Id: Iefa86987f6ce43610177b7c4122744d37386ad6c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124335
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/avmedia/source/framework/mediaitem.cxx 
b/avmedia/source/framework/mediaitem.cxx
index b2b2b8d72b82..127ad8af243f 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -133,18 +133,16 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
 
 bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
 {
-    uno::Sequence< uno::Any > aSeq( 10 );
-
-    aSeq[ 0 ] <<= m_pImpl->m_URL;
-    aSeq[ 1 ] <<= static_cast<sal_uInt32>(m_pImpl->m_nMaskSet);
-    aSeq[ 2 ] <<= static_cast< sal_Int32 >( m_pImpl->m_eState );
-    aSeq[ 3 ] <<= m_pImpl->m_fTime;
-    aSeq[ 4 ] <<= m_pImpl->m_fDuration;
-    aSeq[ 5 ] <<= m_pImpl->m_nVolumeDB;
-    aSeq[ 6 ] <<= m_pImpl->m_bLoop;
-    aSeq[ 7 ] <<= m_pImpl->m_bMute;
-    aSeq[ 8 ] <<= m_pImpl->m_eZoom;
-    aSeq[ 9 ] <<= m_pImpl->m_sMimeType;
+    uno::Sequence< uno::Any > aSeq{ uno::Any(m_pImpl->m_URL),
+                                    
uno::Any(static_cast<sal_uInt32>(m_pImpl->m_nMaskSet)),
+                                    uno::Any(static_cast< sal_Int32 >( 
m_pImpl->m_eState )),
+                                    uno::Any(m_pImpl->m_fTime),
+                                    uno::Any(m_pImpl->m_fDuration),
+                                    uno::Any(m_pImpl->m_nVolumeDB),
+                                    uno::Any(m_pImpl->m_bLoop),
+                                    uno::Any(m_pImpl->m_bMute),
+                                    uno::Any(m_pImpl->m_eZoom),
+                                    uno::Any(m_pImpl->m_sMimeType) };
 
     rVal <<= aSeq;
 
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index 2637eedf8147..fcc06488e913 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -415,7 +415,6 @@ void MediaWindowImpl::onURLChanged()
     if (mxPlayer.is())
     {
         Resize();
-        uno::Sequence<uno::Any> aArgs( 3 );
         uno::Reference<media::XPlayerWindow> xPlayerWindow;
         const Point aPoint;
         const Size aSize(mpChildWindow->GetSizePixel());
@@ -425,9 +424,11 @@ void MediaWindowImpl::onURLChanged()
         // tdf#139609 gtk doesn't need the handle, and fetching it is 
undesirable
         if (!pEnvData || pEnvData->toolkit != SystemEnvData::Toolkit::Gtk)
             nParentWindowHandle = mpChildWindow->GetParentWindowHandle();
-        aArgs[0] <<= nParentWindowHandle;
-        aArgs[1] <<= awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), 
aSize.Height());
-        aArgs[2] <<= reinterpret_cast<sal_IntPtr>(mpChildWindow.get());
+        uno::Sequence<uno::Any> aArgs{
+            uno::Any(nParentWindowHandle),
+            uno::Any(awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), 
aSize.Height())),
+            uno::Any(reinterpret_cast<sal_IntPtr>(mpChildWindow.get()))
+        };
 
         try
         {