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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Nov 17 18:35:55 UTC 2020


 slideshow/source/engine/shapes/viewmediashape.cxx |    5 ++---
 slideshow/source/engine/shapes/viewmediashape.hxx |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 289eb4131d7edc3de231cd68b0ec34b8757200f6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 17 17:00:54 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Nov 17 19:35:15 2020 +0100

    Remove unused ViewMediaShape::implInitializePlayerWindow rMimeType parameter
    
    unused since 08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1 "related: tdf#103884
    remove gltf/collada feature"
    
    Change-Id: Ieed4a2dcd2f465de2356e640383bac2cd45b83d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106017
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 957466dfbb34..950dacc22184 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -291,7 +291,7 @@ namespace slideshow::internal
 
                         if( ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ).getLength() > 1 )
                         {
-                            implInitializePlayerWindow( rBounds, aDeviceParams, sMimeType );
+                            implInitializePlayerWindow( rBounds, aDeviceParams );
                         }
 
                         // set player properties
@@ -380,8 +380,7 @@ namespace slideshow::internal
 
 
         void ViewMediaShape::implInitializePlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
-                                                                 const uno::Sequence< uno::Any >& rVCLDeviceParams,
-                                                                 std::u16string_view )
+                                                                 const uno::Sequence< uno::Any >& rVCLDeviceParams )
         {
             SAL_INFO("slideshow", "ViewMediaShape::implInitializePlayerWindow" );
             if( mpMediaWindow || rBounds.isEmpty() )
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index e5cbe1be737b..ce9c9fbf5139 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -145,8 +145,7 @@ namespace slideshow::internal
             void implSetMediaProperties( const css::uno::Reference< css::beans::XPropertySet >& rxProps );
             void implInitializeMediaPlayer( const OUString& rMediaURL, const OUString& rMimeType );
             void implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds,
-                                             const css::uno::Sequence< css::uno::Any >& rVCLDeviceParams,
-                                             std::u16string_view rMimeType );
+                                             const css::uno::Sequence< css::uno::Any >& rVCLDeviceParams );
             ViewLayerSharedPtr                    mpViewLayer;
             VclPtr< SystemChildWindow >           mpMediaWindow;
             mutable css::awt::Point               maWindowOffset;


More information about the Libreoffice-commits mailing list