include/toolkit/awt/vclxbitmap.hxx | 2 +- include/toolkit/awt/vclxdevice.hxx | 2 +- include/toolkit/awt/vclxfont.hxx | 2 +- include/toolkit/awt/vclxgraphics.hxx | 2 +- include/toolkit/awt/vclxmenu.hxx | 2 +- include/toolkit/awt/vclxpointer.hxx | 2 +- include/toolkit/awt/vclxregion.hxx | 2 +- include/toolkit/awt/vclxwindow.hxx | 2 +- include/toolkit/helper/macros.hxx | 4 ++-- svx/source/gengal/gengal.cxx | 10 ++++++---- 10 files changed, 16 insertions(+), 14 deletions(-)
New commits: commit 25f25a2d25b89361312e165456df3c8bc82157bb Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed May 15 16:04:31 2013 +0200 These functions can throw RuntimeException Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629 diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index a889304..bec8397 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -59,7 +59,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index eb48f97..5e3167c 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -73,7 +73,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index bb385f2..7159111 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -62,7 +62,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index a99e19f..12aeb1b 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -83,7 +83,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 495e898..32b7775 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -83,7 +83,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXMenu* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXMenu* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 56e25bb..a608e43 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -58,7 +58,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXPointer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXPointer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index aa07104..806396e 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -59,7 +59,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXRegion* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXRegion* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 7e415f2..715b355 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -138,7 +138,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXWindow* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static VCLXWindow* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XEventListener diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 7d2eaea..435bc0b 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -44,7 +44,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() t #define IMPL_XUNOTUNNEL( ClassName ) \ IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ -ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() \ +ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ @@ -67,7 +67,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() t { \ return the##ClassName##UnoTunnelId::get().getSeq(); \ } \ -ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() \ +ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ commit d89012691b53def37118b0d892b50476d4e987b7 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed May 15 16:03:41 2013 +0200 Do not dispose component context too early (DeInitVCL might still need it) Change-Id: Ibae79a962ef9d2ea6cf72b70df62c6fa170e05e9 diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 83f223f..6b0ffac 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -50,6 +50,7 @@ public: protected: uno::Reference<lang::XMultiServiceFactory> xMSF; void Init(); + void DeInit(); }; Gallery* createGallery( const OUString& rURL ) @@ -240,14 +241,15 @@ int GalApp::Main() createTheme( aName, aPath, aDestDir, aFiles, mbRelativeURLs ); - // Without this we get extraordinary crashes from the - // drawinglayer VirtualDevice cache when importing svg + return EXIT_SUCCESS; +} + +void GalApp::DeInit() +{ uno::Reference< lang::XComponent >( comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW )-> dispose(); ::comphelper::setProcessServiceFactory( NULL ); - - return EXIT_SUCCESS; } void vclmain::createApplication() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits