diff options
39 files changed, 14 insertions, 40 deletions
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk index ab37efb5a2af..de054713369c 100644 --- a/chart2/CppunitTest_chart2_export.mk +++ b/chart2/CppunitTest_chart2_export.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_export, \ )) $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index 0aec8bd43607..59ed1f0d1456 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_import, \ )) $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index f2b3c15635b2..fd6edb5abac5 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_xshape, \ )) $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index 4d99ed8daec9..66abc7c58ac0 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_dialog_save,\ )) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index d5baaea5d960..df8d67bf79dc 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_macros_test,\ )) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 3e9424c8c26f..8053b7d3b969 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -218,7 +218,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ) \ $(if $(ENABLE_OPENGL), \ slideshow/source/engine/OGLTrans/ogltrans \ - avmedia/source/opengl/avmediaogl \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \ ) \ $(if $(ENABLE_TDE), \ shell/source/backends/kdebe/tdebe1 \ diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 297c16eef9f3..a70dc324f26f 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 16158c1461e3..ac335e3a462c 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index e26df98c7de7..1e6d54e520e3 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c111a3904e06..ffa39b650e89 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index b44caeb43d4e..35866e12a326 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -14,7 +14,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_chart_regression_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index c4aa12e17074..2dcbcf25b123 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 9435535aebe5..56159f947f33 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index c467c2d1abe2..0759d6f00e11 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index ca831732486e..b84ba964e9af 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index eb6c494dd3bf..12532f309a9e 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 92f79829cbcb..1d4e3d167af8 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a7a2f9cd1361..352866a9b73c 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 43f3cb016979..2aca4d931d18 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 0cf0c4a212a1..62dc7fc8fa84 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 60c589cee837..14a961278170 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index b17086563d4e..1a892fa64640 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index e8cc3354b452..d64f3c942aa2 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_outlineobj, \ $(eval $(call gb_CppunitTest_use_external,sc_outlineobj,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index b5ae3da532f0..6d0e33c89089 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_rangelst_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 6345a9c2e157..65fa468a057e 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 9dd130d60483..3ad9d3b9a433 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 53f38faf4036..4b7285c4131f 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tableautoformatfield, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 493b3bf33261..138ddd38835c 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetobj, \ $(eval $(call gb_CppunitTest_use_external,sc_tablesheetobj,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 7a611879aeff..f0ad9125d44d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetsobj, \ $(eval $(call gb_CppunitTest_use_external,sc_tablesheetsobj,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index b9353cace19f..f46622de9e71 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ )) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 45c29aadf788..646b112b09d5 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_add_defs,sd_filters_test,\ endif $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index 4fcc6807dabf..457e90775a57 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_html_export_tests, \ )) $(eval $(call gb_CppunitTest_use_libraries,sd_html_export_tests, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index 3661de715dde..ce8ad634bb57 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests, \ )) $(eval $(call gb_CppunitTest_use_libraries,sd_import_tests, \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index ad43f7ee0a4b..b4fe76aa5f06 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_uimpress,\ $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd)) $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ canvastools \ comphelper \ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index bc5c9a5944ec..2207a8321fb0 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_api,slideshow,\ $(eval $(call gb_CppunitTest_use_library_objects,slideshow,slideshow)) $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ - avmedia \ basegfx \ canvastools \ comphelper \ diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 7f3c2e7c8f00..135a372959b3 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> -// must be first #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> @@ -180,6 +180,9 @@ namespace slideshow bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const { +#if !HAVE_FEATURE_AVMEDIA + (void) rBounds; +#else ::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas(); if( !pCanvas ) @@ -216,7 +219,7 @@ namespace slideshow aViewState, aRenderState ); } - +#endif return true; } @@ -401,6 +404,9 @@ namespace slideshow void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL ) { +#if !HAVE_FEATURE_AVMEDIA + (void) rMediaURL; +#else if( !mxPlayer.is() ) { try @@ -422,6 +428,7 @@ namespace slideshow uno::Reference<uno::XInterface>() ); } } +#endif } diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index a4400507428a..dd8af0c6fec4 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 72a7301a8dd9..385e0c196e7e 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index 0b71cc1c9932..9c43d3dace5c 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \ $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw)) $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ |