Makefile.in | 2 +-
slideshow/source/engine/shapes/viewmediashape.cxx | 11 ++---------
vcl/CustomTarget_nativecode.mk | 2 +-
vcl/commonfuzzer.mk | 9 +++++++++
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 47a2ae73afc1181f0581febf9808e0c0a3dd94c6
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jun 10 16:13:32 2017 +0100
re-add quattro pro fuzzer
Change-Id: Idcd7efaed2a87c727712bb00ddfbf8ed8f5ed34d
diff --git a/Makefile.in b/Makefile.in
index b917769683b4..959ec51878dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -474,7 +474,7 @@ $(foreach ide,\
eclipsecdt,\
$(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide))))
-fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath
Library_tl Library_basegfx Library_canvastools Library_cppcanvas
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer
Executable_psdfuzzer
Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer
Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer
Executable_ww6fuzzer Executable_ww8fuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath
Library_tl Library_basegfx Library_canvastools Library_cppcanvas
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Library_forui
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Execut
able_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer
Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
endif # MAKE_RESTARTS
diff --git a/vcl/CustomTarget_nativecode.mk b/vcl/CustomTarget_nativecode.mk
index f092541a5f66..65c0f6a15021 100644
--- a/vcl/CustomTarget_nativecode.mk
+++ b/vcl/CustomTarget_nativecode.mk
@@ -13,6 +13,6 @@ fuzzer_PYTHONCOMMAND := $(call
gb_ExternalExecutable_get_command,python)
fuzzer_Native_cxx=$(call
gb_CustomTarget_get_workdir,vcl/workben)/native-code.cxx
$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call
gb_CustomTarget_get_workdir,vcl/workben)/.dir
- $(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND)
$(SRCDIR)/solenv/bin/native-code.py -g core -g draw -g writer) > $@
+ $(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND)
$(SRCDIR)/solenv/bin/native-code.py -g core -g draw -g writer -g calc) > $@
# vim: set noet sw=4 ts=4:
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index e75b9b155460..235bfc797fd5 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -45,6 +45,13 @@ fuzzer_libraries = \
swd \
writerfilter \
textfd \
+ analysis \
+ date \
+ pricing \
+ scfilt \
+ scd \
+ vbaevents \
+ sc \
sdfilt \
sd \
sdd \
@@ -62,6 +69,8 @@ fuzzer_libraries = \
drawinglayer \
editeng \
filterconfig \
+ for \
+ forui \
fsstorage \
fwe \
fwi \
commit 595740608f3a405667e5b47d82d8ed69728564b1
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jun 10 15:11:30 2017 +0100
logging the simple message is sufficient
Change-Id: I04ad6cb063af53f79245f923c022f3f9cd3abebd
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx
b/slideshow/source/engine/shapes/viewmediashape.cxx
index 0ff36b81f6dc..833f5b3e5edd 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -96,26 +96,23 @@ namespace slideshow
}
}
-
ViewMediaShape::~ViewMediaShape()
{
try
{
endMedia();
}
- catch (uno::Exception &)
+ catch (const uno::Exception &e)
{
- SAL_WARN( "slideshow", comphelper::anyToString(
cppu::getCaughtException() ) );
+ SAL_WARN("slideshow", "" << e.Message);
}
}
-
const ViewLayerSharedPtr& ViewMediaShape::getViewLayer() const
{
return mpViewLayer;
}
-
void ViewMediaShape::startMedia()
{
if( !mxPlayer.is() )
@@ -125,7 +122,6 @@ namespace slideshow
mxPlayer->start();
}
-
void ViewMediaShape::endMedia()
{
// shutdown player window
@@ -156,21 +152,18 @@ namespace slideshow
}
}
-
void ViewMediaShape::pauseMedia()
{
if (mxPlayer.is())
mxPlayer->stop();
}
-
void ViewMediaShape::setMediaTime(double fTime)
{
if (mxPlayer.is())
mxPlayer->setMediaTime(fTime);
}
-
bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds )
const
{
#if !HAVE_FEATURE_AVMEDIA
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
