unwind resource

Change-Id: I7a951548204745035bd69e4311e5fa1fe91b2d32

7 files changed, 21 insertions, 75 deletions

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index b9d2700d1229..01bbfc881bf2 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_set_include,cui/res,\
 ))
 
 $(eval $(call gb_SrsTarget_add_files,cui/res,\
-    cui/source/customize/acccfg.src \
     cui/source/customize/cfg.src \
     cui/source/customize/macropg.src \
     cui/source/dialogs/cuires.src \
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index b0d27edc18a3..e7578c997dcd 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -36,7 +36,6 @@
 #include <vcl/builderfactory.hxx>
 
 #include "cuires.hrc"
-#include "acccfg.hrc"
 
 #include <svx/svxids.hrc>
 
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
deleted file mode 100644
index 4dfc8032b9b5..000000000000
--- a/cui/source/customize/acccfg.hrc
+++ /dev/null
@@ -1,25 +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 .
- */
-
-#define STR_GROUP_STYLES        58
-
-#define STR_BASICMACROS         67
-#define STR_HUMAN_APPNAME       69
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
deleted file mode 100644
index 74dafebecfcd..000000000000
--- a/cui/source/customize/acccfg.src
+++ /dev/null
@@ -1,40 +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 "helpid.hrc"
-#include "cuires.hrc"
-#include "acccfg.hrc"
-
-Resource RID_SVXPAGE_CONFIGGROUPBOX
-{
-    String STR_BASICMACROS
-    {
-        Text [ en-US ] = "BASIC Macros" ;
-    };
-    String STR_HUMAN_APPNAME
-    {
-        Text = "%PRODUCTNAME" ;
-    };
-    String STR_GROUP_STYLES
-    {
-        Text [ en-US ] = "Styles" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 06356ac2e2ef..8fc79412dbf9 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/ui/theUICategoryDescription.hpp>
 
-#include "acccfg.hrc"
 #include "helpid.hrc"
 #include <basic/sbx.hxx>
 #include <basic/basicmanagerrepository.hxx>
@@ -340,7 +339,7 @@ void SfxConfigFunctionListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
     pStylesInfo = pStyles;
 }
 
-struct SvxConfigGroupBoxResource_Impl : public Resource
+struct SvxConfigGroupBoxResource_Impl
 {
     Image m_hdImage;
     Image m_libImage;
@@ -358,20 +357,18 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
 };
 
 SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
-    Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
     m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))),
     m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))),
     m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))),
     m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))),
     m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)),
     m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
-    m_sMacros(CUI_RESSTR(STR_BASICMACROS)),
+    m_sMacros(CUI_RESSTR(RID_SVXSTR_BASICMACROS)),
     m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
-    m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)),
+    m_aStrGroupStyles(CUI_RESSTR(RID_SVXSTR_GROUP_STYLES)),
     m_collapsedImage(BitmapEx(CUI_RES(RID_CUIBMP_COLLAPSED))),
     m_expandedImage(BitmapEx(CUI_RES(RID_CUIBMP_EXPANDED)))
 {
-    FreeResource();
 }
 
 SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle)
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index 88e2abdc1c9d..5cd9669b726f 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -140,4 +140,19 @@ String RID_SVXSTR_HANJA
     Text [ en-US ] = "Hanja";
 };
 
+String RID_SVXSTR_BASICMACROS
+{
+    Text [ en-US ] = "BASIC Macros" ;
+};
+
+String RID_SVXSTR_HUMAN_APPNAME
+{
+    Text = "%PRODUCTNAME" ;
+};
+
+String RID_SVXSTR_GROUP_STYLES
+{
+    Text [ en-US ] = "Styles" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 38283b58edfb..5c40c7b80fec 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -264,7 +264,6 @@
 
 // customize
 #define RID_SVXDLG_CUSTOMIZE                (RID_SVX_START + 291)
-#define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
 
 #define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS (RID_SVX_START + 1167)
 #define RID_SVXSTR_NEW_MENU                 (RID_SVX_START + 1039)
@@ -409,8 +408,10 @@
 #define RID_SVXSTR_HYPH_SPECIAL                             (RID_SVX_START + 1232)
 #define RID_SVXSTR_NUM_MIN_WORDLEN                          (RID_SVX_START + 1233)
 #define RID_SVXSTR_GRAMMAR_AUTO                             (RID_SVX_START + 1234)
+#define RID_SVXSTR_GROUP_STYLES                             (RID_SVX_START + 1235)
+#define RID_SVXSTR_BASICMACROS                              (RID_SVX_START + 1236)
+#define RID_SVXSTR_HUMAN_APPNAME                            (RID_SVX_START + 1237)
 // There is a gap here because of removed strings
-
 #define RID_SVXSTR_CHG_MATH                                 (RID_SVX_START + 1238)
 #define RID_SVXSTR_CHG_WRITER                               (RID_SVX_START + 1239)
 #define RID_SVXSTR_CHG_CALC                                 (RID_SVX_START + 1240)