Do not dispose component context too early (DeInitVCL might still need it)

Change-Id: Ibae79a962ef9d2ea6cf72b70df62c6fa170e05e9

1 files changed, 6 insertions, 4 deletions

diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 83f223f95b68..6b0ffac7ca5b 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()