summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-10-09 23:50:50 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2019-10-10 04:15:41 +0200
commit9377ff20724b156c32728d347cdf843fe23dcd81 (patch)
tree89458fd0038a9a5f412aec7bc477f9d638997150 /sd
parentbad6a946b1850a7f9fb4847e0f17b219a90ff200 (diff)
No need to do anything when !HAVE_FEATURE_AVMEDIA
Change-Id: I06d47b69d65c2ab2dbb5bcef19c0ac66eba4c128 Reviewed-on: https://gerrit.libreoffice.org/80571 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/func/fuinsert.cxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index af372f003ff7..5226627911de 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -668,6 +668,7 @@ rtl::Reference<FuPoor> FuInsertAVMedia::Create( ViewShell* pViewSh, ::sd::Window
void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
{
+#if HAVE_FEATURE_AVMEDIA
OUString aURL;
const SfxItemSet* pReqArgs = rReq.GetArgs();
bool bAPI = false;
@@ -685,9 +686,7 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
bool bLink(true);
if (!(bAPI
-#if HAVE_FEATURE_AVMEDIA
|| ::avmedia::MediaWindow::executeMediaURLDialog(mpWindow ? mpWindow->GetFrameWeld() : nullptr, aURL, & bLink)
-#endif
))
return;
@@ -696,7 +695,6 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
if( mpWindow )
mpWindow->EnterWait();
-#if HAVE_FEATURE_AVMEDIA
if( !::avmedia::MediaWindow::isMediaURL( aURL, "", true, &aPrefSize ) )
{
if( mpWindow )
@@ -734,10 +732,7 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
mpWindow->LeaveWait();
}
#else
- if( mpWindow )
- mpWindow->LeaveWait();
- (void) aPrefSize;
- (void) bLink;
+ (void)rReq;
#endif
}