Ensure ResMgr outlives Resources

6 files changed, 47 insertions, 16 deletions

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index de692bd138b8..5b9987acb22a 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -154,7 +154,6 @@ namespace formula
         DECL_LINK(FuncSelHdl, void *);
         DECL_LINK(StructSelHdl, void *);
     public:
-        OModuleClient                                           m_aModuleClient;
         mutable uno::Reference< sheet::XFormulaOpCodeMapper>    m_xOpCodeMapper;
         uno::Sequence< sheet::FormulaToken >                    m_aTokenList;
         ::std::auto_ptr<FormulaTokenArray>                      m_pTokenArray;
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index a6542ebed536..ec75b0566f9d 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -41,7 +41,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
-#include "ModuleHelper.hxx"
+#include "formula/omoduleclient.hxx"
 //============================================================================
 namespace formula
 {
diff --git a/formula/source/ui/dlg/omoduleclient.cxx b/formula/source/ui/dlg/omoduleclient.cxx
new file mode 100644
index 000000000000..c18089ebca44
--- /dev/null
+++ b/formula/source/ui/dlg/omoduleclient.cxx
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "sal/config.h"
+
+#include "formula/omoduleclient.hxx"
+
+#include "ModuleHelper.hxx"
+
+formula::OModuleClient::OModuleClient() {
+    OModule::registerClient();
+}
+
+formula::OModuleClient::~OModuleClient() {
+    OModule::revokeClient();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 968de863c9a6..4a0f49694c2c 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -39,8 +39,8 @@
 
 #include <vector>
 #include "formula/funcutl.hxx"
+#include "formula/omoduleclient.hxx"
 #include "ControlHelper.hxx"
-#include "ModuleHelper.hxx"
 
 namespace formula
 {
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 8ae7715f9f76..74ddec17fb92 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -37,7 +37,7 @@
 #include <vcl/tabctrl.hxx>
 #include <svtools/svtreebx.hxx>
 #include "formula/IFunctionDescription.hxx"
-#include "ModuleHelper.hxx"
+#include "formula/omoduleclient.hxx"
 
 //============================================================================
 
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 37a62be5af9d..6f1087618aa6 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -39,6 +39,7 @@ namespace formula
     //=========================================================================
     //= OModule
     //=========================================================================
+    class OModuleClient;
     class OModuleImpl;
     class FORMULA_DLLPUBLIC OModule
     {
@@ -70,18 +71,6 @@ namespace formula
     };
 
     //=========================================================================
-    //= OModuleClient
-    //=========================================================================
-    /** base class for objects which uses any global module-specific ressources
-    */
-    class FORMULA_DLLPUBLIC OModuleClient
-    {
-    public:
-        OModuleClient()     { OModule::registerClient(); }
-        ~OModuleClient()    { OModule::revokeClient(); }
-    };
-
-    //=========================================================================
     //= ModuleRes
     //=========================================================================
     /** specialized ResId, using the ressource manager provided by the global module