expand src templates

Change-Id: I13afaa9d0c7c9b46b3ebaedf299de41bed551e7c

8 files changed, 6 insertions, 42 deletions

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 060743ea9090..955a7aa5d65d 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_use_srstargets,dbaccess/dbu,\
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
     $$(INCLUDE) \
-	-I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
     -I$(SRCDIR)/dbaccess/inc \
     -I$(SRCDIR)/dbaccess/source/ui/inc \
     -I$(call gb_SrsTemplateTarget_get_include_dir,) \
@@ -60,8 +59,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,dbaccess/dbu,\
     dbaccess/source/ui/imagelists/dbimagelists.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
-    dbaccess/source/ui/inc/toolbox_tmpl.hrc \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index cca23a0f65d6..b59bee50eeee 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -21,7 +21,6 @@
 #include <sfx2/cntids.hrc>
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
-#include "toolbox.hrc"
 
 #define MN_PROPS    25
 
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index b7b605efc522..98793aed630a 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -20,7 +20,6 @@
 #include "dbu_brw.hrc"
 #include "browserids.hxx"
 #include <svx/globlmn.hrc>
-#include "toolbox.hrc"
 
 String STR_QUERY_BRW_DELETE_ROWS
 {
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 3e3531bd230c..07d236a51dc9 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -19,7 +19,6 @@
 #include "dbu_brw.hrc"
 #include "dbaccess_helpid.hrc"
 #include "browserids.hxx"
-#include "toolbox.hrc"
 #include <svx/globlmn.hrc>
 
 Menu RID_SBA_GRID_COLCTXMENU
@@ -34,7 +33,9 @@ Menu RID_SBA_GRID_COLCTXMENU
         };
         MenuItem
         {
-            MID_COLUMN_WIDTH
+            Identifier = ID_BROWSER_COLWIDTH ;
+            HelpID = HID_BROWSER_COLUMNWIDTH ;
+            Text [ en-US ] = "Column ~Width..." ;
             HelpID = HID_BROWSER_COLUMNWIDTH;
         };
         MenuItem
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 13b96d40caa4..4d09f3b74f0f 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -20,7 +20,6 @@
 #include "dbaccess_helpid.hrc"
 #include "dbu_dlg.hrc"
 #include "browserids.hxx"
-#include "toolbox.hrc"
 
 String STR_ENTER_CONNECTION_PASSWORD
 {
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
deleted file mode 100644
index 679b044139c9..000000000000
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ /dev/null
@@ -1,29 +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 .
- */
-#ifndef DBAUI_TOOLBOX_HRC
-#define DBAUI_TOOLBOX_HRC
-
-#define MID_COLUMN_WIDTH\
-    Identifier = ID_BROWSER_COLWIDTH ;\
-    HelpID = HID_BROWSER_COLUMNWIDTH ;\
-    Text [ en-US ] = "Column ~Width..." ;\
-
-#endif // DBAUI_TOOLBOX_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 27ef7d82b6aa..ea29a560a117 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -22,7 +22,6 @@
 #include <sfx2/cntids.hrc>
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
-#include "toolbox.hrc"
 
 Menu RID_MENU_JOINVIEW_CONNECTION
 {
@@ -58,7 +57,9 @@ Menu RID_QUERYCOLPOPUPMENU
     {
         MenuItem
         {
-            MID_COLUMN_WIDTH
+            Identifier = ID_BROWSER_COLWIDTH ;
+            HelpID = HID_BROWSER_COLUMNWIDTH ;
+            Text [ en-US ] = "Column ~Width..." ;
         };
         MenuItem
         {
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index a191b3435325..f4bc2a1ad15a 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -22,7 +22,6 @@
 #include "dbaccess_slotid.hrc"
 #include "browserids.hxx"
 #include <svx/globlmn.hrc>
-#include "toolbox.hrc"
 
 String STR_TABLEDESIGN_DBFIELDTYPES
 {