[Libreoffice-commits] core.git: 9 commits - framework/source sd/source vcl/inc vcl/opengl vcl/workben
Caolán McNamara
caolanm at redhat.com
Thu Nov 13 14:40:10 PST 2014
framework/source/uiconfiguration/imagemanagerimpl.cxx | 7 +-
framework/source/uiconfiguration/imagemanagerimpl.hxx | 2
sd/source/ui/presenter/SlideRenderer.cxx | 3
sd/source/ui/presenter/SlideRenderer.hxx | 2
vcl/inc/openglgdiimpl.hxx | 1
vcl/opengl/salbmp.cxx | 12 +++
vcl/workben/outdevgrind.cxx | 57 +++++++++++-------
vcl/workben/vcldemo.cxx | 23 ++++++-
8 files changed, 72 insertions(+), 35 deletions(-)
New commits:
commit ee0f878da903f5054a03f526160bc6958c876128
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:28:05 2014 +0000
coverity#1251596 Uncaught exception
Change-Id: I02b7abcd9ee17158ee063b2c9b6d0324eef70801
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index cbcd1c5..528eae3 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -909,38 +909,51 @@ int GrindApp::Main()
SAL_IMPLEMENT_MAIN()
{
- bool bHelp = false;
-
- for( sal_uInt16 i = 0; i < Application::GetCommandLineParamCount(); i++ )
+ try
{
- OUString aParam = Application::GetCommandLineParam( i );
+ bool bHelp = false;
- if( aParam == "--help" || aParam == "-h" )
- bHelp = true;
- }
+ for( sal_uInt16 i = 0; i < Application::GetCommandLineParamCount(); i++ )
+ {
+ OUString aParam = Application::GetCommandLineParam( i );
- if( bHelp )
- {
- printf( "outdevgrind - Profile OutputDevice\n" );
- return EXIT_SUCCESS;
- }
+ if( aParam == "--help" || aParam == "-h" )
+ bHelp = true;
+ }
+
+ if( bHelp )
+ {
+ printf( "outdevgrind - Profile OutputDevice\n" );
+ return EXIT_SUCCESS;
+ }
- tools::extendApplicationEnvironment();
+ tools::extendApplicationEnvironment();
- uno::Reference< uno::XComponentContext > xContext = cppu::defaultBootstrap_InitialComponentContext();
- uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY );
+ uno::Reference< uno::XComponentContext > xContext = cppu::defaultBootstrap_InitialComponentContext();
+ uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY );
- if( !xServiceManager.is() )
- Application::Abort( "Failed to bootstrap" );
+ if( !xServiceManager.is() )
+ Application::Abort( "Failed to bootstrap" );
- comphelper::setProcessServiceFactory( xServiceManager );
+ comphelper::setProcessServiceFactory( xServiceManager );
- InitVCL();
+ InitVCL();
- GrindApp aGrindApp;
- aGrindApp.Main();
+ GrindApp aGrindApp;
+ aGrindApp.Main();
- DeInitVCL();
+ DeInitVCL();
+ }
+ catch (const css::uno::Exception& e)
+ {
+ SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ return EXIT_FAILURE;
+ }
+ catch (const std::exception& e)
+ {
+ SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ return EXIT_FAILURE;
+ }
return EXIT_SUCCESS;
}
commit 5b7497e5aad80774167a6c1f050aabe429280918
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:24:46 2014 +0000
coverity#1251600 Uncaught exception
and
coverity#1251597 Uncaught exception
coverity#1251598 Uncaught exception
coverity#1251599 Uncaught exception
Change-Id: Ifd14f1db5692a8f3ccd1d9ea45d8f0e16c4b0324
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 46538cb..e56d95c 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -730,10 +730,23 @@ public:
virtual int Main() SAL_OVERRIDE
{
- DemoWin aMainWin;
- aMainWin.SetText( "Interactive VCL demo" );
- aMainWin.Show();
- Application::Execute();
+ try
+ {
+ DemoWin aMainWin;
+ aMainWin.SetText( "Interactive VCL demo" );
+ aMainWin.Show();
+ Application::Execute();
+ }
+ catch (const css::uno::Exception& e)
+ {
+ SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ return 1;
+ }
+ catch (const std::exception& e)
+ {
+ SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ return 1;
+ }
return 0;
}
commit 0b10bac9138fe560f9d108adaa7a875f78dd8ea7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:22:49 2014 +0000
coverity#1251605 Uninitialized scalar field
Change-Id: I5f18bd7bcd332e28df9dcec43b9dedc664290aec
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index b5d2ccc..46538cb 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -79,6 +79,8 @@ public:
, mnSelectedRenderer(-1)
, mpButton(NULL)
, mpButtonWin(NULL)
+ , mnBounceX(1)
+ , mnBounceY(1)
{
if (!Application::LoadBrandBitmap("intro", maIntro))
Application::Abort("Failed to load intro image");
commit 88fde3ce509caed402348297a0b6828d5233d408
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:21:34 2014 +0000
coverity#1251604 Uninitialized scalar field
Change-Id: I34ed719ecc81db924b9ec1ca8f22ffa81246a723
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 0858c15..d7e38b0 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -299,7 +299,8 @@ private:
public:
ImplPixelFormat1( const BitmapPalette& rPalette )
- : mrPalette( rPalette )
+ : mrPalette(rPalette)
+ , mnX(0)
{
}
virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
commit ac01b341ed983d22be5d29b5561e0b448693d931
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:20:56 2014 +0000
coverity#1251603 Uninitialized scalar field
Change-Id: I8e8d11ec292b480d7db750733b31b3be233df8b0
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 55f8d09..0858c15 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -271,7 +271,9 @@ private:
public:
ImplPixelFormat4( const BitmapPalette& rPalette )
- : mrPalette( rPalette )
+ : mrPalette( rPalette )
+ , mnX(0)
+ , mnShift(4)
{
}
virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
commit 1f3978aba2520138bd0fd42ec9634efca7e8d00f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:19:44 2014 +0000
coverity#1251602 Uninitialized scalar field
Change-Id: If14a2214618a750ee4cb97667088c2a68747f3c7
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 5a98d34..55f8d09 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -46,7 +46,12 @@ OpenGLSalBitmap::OpenGLSalBitmap()
, mnBufWidth(0)
, mnBufHeight(0)
, mnTexProgram(0)
+, mnTexSamplerUniform(0)
, mnConvProgram(0)
+, mnConvSamplerUniform(0)
+, mnConvKernelUniform(0)
+, mnConvKernelSizeUniform(0)
+, mnConvOffsetsUniform(0)
{
}
commit fb67b8e71f575318b656f182ec66f4686b2e378d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:17:59 2014 +0000
coverity#1251601 Uninitialized pointer field
Change-Id: I6f3be2f87c533ec75f1e60fbf4e5c541958937c4
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 167fe60..1fb0d61 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -37,7 +37,6 @@ protected:
OpenGLContext maContext;
SalFrame* mpFrame;
- SalVirtualDevice* mpVDev;
int mnPainting;
// clipping
commit b43fcb4b5e58771cf4f24421a1ae0ee48d729cc6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:16:36 2014 +0000
coverity#1251595 Uncaught exception
Change-Id: I24eaec49bb89e9f490d5bb0071723b41673e1845
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index de30d27..0238ff0 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -905,9 +905,10 @@ void ImageManagerImpl::replaceImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IllegalAccessException,
- ::com::sun::star::uno::RuntimeException)
+throw (css::lang::IllegalArgumentException,
+ css::lang::IllegalAccessException,
+ css::uno::RuntimeException,
+ std::exception)
{
CmdToXGraphicNameAccess* pInsertedImages( 0 );
CmdToXGraphicNameAccess* pReplacedImages( 0 );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index ea5e47a..40ba097 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -114,7 +114,7 @@ namespace framework
::com::sun::star::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception);
void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
commit dd3d0a5b5f052369b4d43e7715307470423c7e31
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 13 21:15:34 2014 +0000
coverity#1251594 Uncaught exception
Change-Id: Ia018121ccffa9534f7d23bb768f2b2a06296cbc2
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index 0865d0d..1e6da4b 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -144,7 +144,8 @@ BitmapEx SlideRenderer::CreatePreview (
const Reference<drawing::XDrawPage>& rxSlide,
const awt::Size& rMaximalSize,
sal_Int16 nSuperSampleFactor)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException,
+ std::exception)
{
const SdPage* pPage = SdPage::getImplementation(rxSlide);
if (pPage == NULL)
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index 813d212..6e318bc 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -84,7 +84,7 @@ private:
const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
/** This method throws a DisposedException when the object has already been
disposed.
More information about the Libreoffice-commits
mailing list