diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:40:13 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-25 11:05:47 +0000 |
| commit | 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch) | |
| tree | 1482b9e0b899a783f64aaed3b9728533a81eff58 /sd | |
| parent | 44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff) | |
fix headless build
disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test
Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index c26054da4f0b..01a795a967e2 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -816,8 +816,9 @@ void FuInsert3DModel::DoExecute( SfxRequest& ) aPos.X() -= aSize.Width() >> 1; aPos.Y() -= aSize.Height() >> 1; } - +#if HAVE_FEATURE_OPENGL mpView->Insert3DModelURL( sURL, nAction, aPos, aSize ) ; +#endif if( mpWindow ) mpWindow->LeaveWait(); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index d68de3a92830..b76b8717892a 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -292,7 +292,7 @@ void View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, InsertMediaObj( realURL, "application/vnd.sun.star.media", rAction, rPos, rSize ); } - +#if HAVE_FEATURE_OPENGL #if HAVE_FEATURE_GLTF void View::Insert3DModelURL( const OUString& rModelURL, sal_Int8& rAction, @@ -311,6 +311,7 @@ void View::Insert3DModelURL( pRetObject->setMediaProperties(aItem); } #endif +#endif SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rMimeType, sal_Int8& rAction, const Point& rPos, const Size& rSize ) |