diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2022-07-05 13:54:42 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2022-07-05 18:04:31 +0200 |
| commit | 92f531209675e1855798f513fb7698fceddd022b (patch) | |
| tree | 4ae5ed1488499152ad325574dc288a97a4ef6523 | |
| parent | 9f72592591f1dfbfda79e1aecb161de97f2a1b73 (diff) | |
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
| -rw-r--r-- | sc/source/ui/drawfunc/fuins1.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index c6f2f69daaa5..1e2791b12e16 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -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, diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 9ab22b73bf5b..429a8c408753 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -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(); |