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

[Michael Weghorn (via logerrit)]

 svx/source/unodraw/unopage.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 79ce9d030b934c375e4f9d12b577ff3f29770a46
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Apr 8 15:06:04 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Apr 9 07:26:10 2020 +0200

    tdf#96760 Don't assert on presentation with video for non-desktop
    
    Since the OBJ_MEDIA case was only handled '#if HAVE_FEATURE_DESKTOP',
    a non-desktop debug build would run into the assert in the
    default case and complain about a "Not implemented Starone-Shape".
    
    The corresponding HAVE_FEATURE_DESKTOP switch had been added with
    commit c0b3d5be8fcec28190b1f25c9c0fd99916299249
    ("Try harder to bypass avmedia on non-desktop for now", 2014-04-17).
    However, at a quick glance, SvxMediaShape now properly handles
    the case where avmedia is not available itself (presumably since
    commit 54982d5fea21d9e81e1561a74fd341ddb0570c91, "svx, check
    HAVE_FEATURE_AVMEDIA", 2018-01-07).
    
    For an Android Viewer debug build, a placeholder is now shown instead
    of the video (just as was the case for a non-debug build already
    without this patch), rather than aborting.
    
    Change-Id: I49864a3742d0435cd5346f561dea9f2f804ace70
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91921
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f80f92e77f56..bba5929f5b2f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -611,9 +611,6 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor,
 
 SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer )
 {
-#if !HAVE_FEATURE_DESKTOP
-    (void) referer;
-#endif
     SvxShape* pRet = nullptr;
 
     switch( nInventor )
@@ -779,11 +776,9 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent
                 case OBJ_CUSTOMSHAPE:
                     pRet = new SvxCustomShape( pObj );
                     break;
-#if HAVE_FEATURE_DESKTOP
                 case OBJ_MEDIA:
                     pRet = new SvxMediaShape( pObj, referer );
                     break;
-#endif
                 case OBJ_TABLE:
                     pRet = new SvxTableShape( pObj );
                     break;