fix build with disable-avmedia.

Change-Id: Ia57db9b2bcec4ff73e1332bb5b2197080343baa4
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136831
Tested-by: Jenkins
This commit is contained in:
Michael Meeks
2022-07-05 18:04:31 +02:00
parent 9f72592591
commit 92f5312096
2 changed files with 7 additions and 4 deletions
+3 -4
View File
@@ -207,6 +207,8 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
pObj->SetGraphicLink( rFileName );
}
#if HAVE_FEATURE_AVMEDIA
static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi,
ScTabViewShell* pViewSh, const vcl::Window* pWindow, SdrView* pView,
const Size& rPrefSize, bool const bLink )
@@ -241,12 +243,8 @@ static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi,
{
uno::Reference<frame::XModel> const xModel(
rData.GetDocument().GetDocumentShell()->GetModel());
#if HAVE_FEATURE_AVMEDIA
bool const bRet = ::avmedia::EmbedMedia(xModel, rMediaURL, realURL);
if (!bRet) { return; }
#else
return;
#endif
}
SdrMediaObj* pObj = new SdrMediaObj(
@@ -256,6 +254,7 @@ static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi,
pObj->setURL( realURL, ""/*TODO?*/ );
pView->InsertObjectAtView( pObj, *pPV, bApi ? SdrInsertFlags::DONTMARK : SdrInsertFlags::NONE );
}
#endif
FuInsertGraphic::FuInsertGraphic( ScTabViewShell& rViewSh,
vcl::Window* pWin,
+4
View File
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
@@ -143,11 +145,13 @@ View::~View()
// release content of selection clipboard, if we own the content
ClearSelectionClipboard();
#if HAVE_FEATURE_AVMEDIA
if (mxDropMediaSizeListener)
{
suppress_fun_call_w_exception(mxDropMediaSizeListener->dispose());
mxDropMediaSizeListener.clear();
}
#endif
maDropErrorIdle.Stop();
maDropInsertFileIdle.Stop();