9 files changed, 9 insertions, 52 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 2290a98ac4a4..814184cbb628 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -50,8 +50,8 @@
 #include "formula/formulahelper.hxx"
 #include "structpg.hxx"
 #include "parawin.hxx"
-#include "ModuleHelper.hxx"
 #include "strings.hrc"
+#include "core_resource.hxx"
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/sheet/FormulaLanguage.hpp>
 #include <com/sun/star/sheet/FormulaMapGroup.hpp>
@@ -236,8 +236,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     m_pTheRefButton (nullptr),
     m_pMEdit        (nullptr),
     m_bUserMatrixFlag(false),
-    m_aTitle1       ( ModuleRes( STR_TITLE1 ) ),
-    m_aTitle2       ( ModuleRes( STR_TITLE2 ) ),
+    m_aTitle1       ( ForResId( STR_TITLE1 ) ),
+    m_aTitle2       ( ForResId( STR_TITLE2 ) ),
     m_aFormulaHelper(_pFunctionMgr),
     m_bIsShutDown   (false),
     m_bMakingTree   (false),
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index e017a9a6c543..8a12f389a73c 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -25,7 +25,6 @@
 #include "formula/IFunctionDescription.hxx"
 
 #include "funcpage.hxx"
-#include "ModuleHelper.hxx"
 #include <unotools/syslocale.hxx>
 #include <unotools/charclass.hxx>
 
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index efdd45b4f9bd..020f962a12cb 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -30,7 +30,6 @@
 #include <svtools/treelistbox.hxx>
 
 #include <vector>
-#include "formula/omoduleclient.hxx"
 
 namespace formula
 {
@@ -58,7 +57,6 @@ typedef const IFunctionDescription* TFunctionDesc;
 class FuncPage : public TabPage
 {
 private:
-    OModuleClient            m_aModuleClient;
     Link<FuncPage&,void>     aDoubleClickLink;
     Link<FuncPage&,void>     aSelectionLink;
     VclPtr<ListBox>          m_pLbCategory;
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e52628d867e6..0271e87956d0 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -26,9 +26,9 @@
 #include "formula/funcutl.hxx"
 #include "formula/IControlReferenceHandler.hxx"
 #include "ControlHelper.hxx"
-#include "ModuleHelper.hxx"
 #include "strings.hrc"
 #include "bitmaps.hlst"
+#include "core_resource.hxx"
 #include "com/sun/star/accessibility/AccessibleRole.hpp"
 
 namespace formula
@@ -521,8 +521,8 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
     ImageButton(_pParent, nStyle),
     aImgRefStart(BitmapEx(RID_BMP_REFBTN1)),
     aImgRefDone(BitmapEx(RID_BMP_REFBTN2)),
-    aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ) ),
-    aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ) ),
+    aShrinkQuickHelp( ForResId( RID_STR_SHRINK ) ),
+    aExpandQuickHelp( ForResId( RID_STR_EXPAND ) ),
     pAnyRefDlg( nullptr ),
     pRefEdit( nullptr )
 {
diff --git a/formula/source/ui/dlg/omoduleclient.cxx b/formula/source/ui/dlg/omoduleclient.cxx
deleted file mode 100644
index 328287e1b4db..000000000000
--- a/formula/source/ui/dlg/omoduleclient.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#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.cxx b/formula/source/ui/dlg/parawin.cxx
index f066b40e82a5..128f81d9c475 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -26,9 +26,9 @@
 #include "formula/formdata.hxx"
 #include "formula/IFunctionDescription.hxx"
 #include <formula/funcvarargs.h>
-#include "ModuleHelper.hxx"
 #include "strings.hrc"
 #include "bitmaps.hlst"
+#include "core_resource.hxx"
 
 namespace formula
 {
@@ -38,8 +38,8 @@ ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg):
     TabPage         (pParent, "ParameterPage", "formula/ui/parameter.ui"),
     pFuncDesc       ( nullptr ),
     pMyParent       (_pDlg),
-    m_sOptional     ( ModuleRes( STR_OPTIONAL ) ),
-    m_sRequired     ( ModuleRes( STR_REQUIRED ) )
+    m_sOptional     ( ForResId( STR_OPTIONAL ) ),
+    m_sRequired     ( ForResId( STR_REQUIRED ) )
 {
     get(m_pFtEditDesc, "editdesc");
     get(m_pFtArgName, "parname");
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 6884b93a08a3..526b571bdc01 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -30,7 +30,6 @@
 
 #include <vector>
 #include "formula/funcutl.hxx"
-#include "formula/omoduleclient.hxx"
 #include "ControlHelper.hxx"
 
 namespace formula
@@ -44,7 +43,6 @@ class IControlReferenceHandler;
 class ParaWin : public TabPage
 {
 private:
-        OModuleClient        m_aModuleClient;
         Link<ParaWin&,void>  aFxLink;
         Link<ParaWin&,void>  aArgModifiedLink;
 
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index afebc0cba5c8..da566d673687 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -25,7 +25,6 @@
 #include "structpg.hxx"
 #include "formula/formdata.hxx"
 #include "formula/formula.hxx"
-#include "ModuleHelper.hxx"
 #include "formula/IFunctionDescription.hxx"
 #include "bitmaps.hlst"
 
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index b20fa265051d..c1ade7a5741a 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -27,8 +27,6 @@
 #include <vcl/tabctrl.hxx>
 #include <svtools/treelistbox.hxx>
 #include "formula/IFunctionDescription.hxx"
-#include "formula/omoduleclient.hxx"
-
 
 namespace formula
 {
@@ -65,7 +63,6 @@ public:
 class StructPage : public TabPage
 {
 private:
-    OModuleClient           m_aModuleClient;
     Link<StructPage&,void>  aSelLink;
 
     VclPtr<StructListBox>   m_pTlbStruct;