[Libreoffice-commits] core.git: 5 commits - basctl/AllLangResTarget_basctl.mk chart2/AllLangResTarget_chartcontroller.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/Library_dbu.mk dbaccess/source l10ntools/source reportdesign/AllLangResTarget_rpt.mk reportdesign/AllLangResTarget_rptui.mk reportdesign/source sc/AllLangResTarget_sc.mk sc/source sd/AllLangResTarget_sd.mk solenv/gbuild starmath/AllLangResTarget_sm.mk starmath/source svx/AllLangResTarget_svx.mk svx/inc svx/Module_svx.mk svx/source sw/AllLangResTarget_sw.mk sw/source
David Tardon
dtardon at redhat.com
Mon Mar 7 16:47:05 UTC 2016
basctl/AllLangResTarget_basctl.mk | 5
chart2/AllLangResTarget_chartcontroller.mk | 1
dbaccess/AllLangResTarget_dbu.mk | 10 -
dbaccess/Library_dbu.mk | 1
dbaccess/source/ui/app/app.src | 10 -
dbaccess/source/ui/browser/sbabrw.src | 8 -
dbaccess/source/ui/browser/sbagrid.src | 10 -
dbaccess/source/ui/dlg/dbadmin2.src | 1
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 29 ----
dbaccess/source/ui/querydesign/query.src | 18 +-
dbaccess/source/ui/relationdesign/relation.src | 1
dbaccess/source/ui/tabledesign/table.src | 18 +-
l10ntools/source/localize.cxx | 5
reportdesign/AllLangResTarget_rpt.mk | 5
reportdesign/AllLangResTarget_rptui.mk | 5
reportdesign/source/ui/dlg/CondFormat.src | 1
reportdesign/source/ui/dlg/GroupsSorting.src | 5
reportdesign/source/ui/dlg/Navigator.src | 5
reportdesign/source/ui/dlg/PageNumber.src | 1
reportdesign/source/ui/inspection/inspection.src | 1
reportdesign/source/ui/report/report.src | 13 +-
sc/AllLangResTarget_sc.mk | 5
sc/source/ui/src/toolbox.src | 1
sd/AllLangResTarget_sd.mk | 6
solenv/gbuild/AllLangResTarget.mk | 142 -----------------------
solenv/gbuild/TargetLocations.mk | 4
solenv/gbuild/extensions/post_Counters.mk | 2
starmath/AllLangResTarget_sm.mk | 5
starmath/source/smres.src | 1
starmath/source/toolbox.src | 1
svx/AllLangResTarget_svx.mk | 5
svx/Module_svx.mk | 1
svx/inc/globlmn_tmpl.hrc | 48 -------
svx/source/fmcomp/gridctrl.src | 5
svx/source/form/datanavi.src | 1
svx/source/form/fmexpl.src | 19 ++-
sw/AllLangResTarget_sw.mk | 6
sw/source/ui/app/app.src | 1
sw/source/ui/app/mn.src | 1
sw/source/ui/shells/shells.src | 1
sw/source/uibase/ribbar/workctrl.src | 1
sw/source/uibase/uiview/view.src | 1
42 files changed, 75 insertions(+), 335 deletions(-)
New commits:
commit 64b99327d301dc193edcb64d26bd823703acdb34
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 15:03:07 2016 +0100
drop handling of templates in SrsTarget
Change-Id: I5445837ec4f647e91fe2aeab1251e48628f5e7f1
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index ef10ec5..433a5cd 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -22,11 +22,8 @@
#
# target task depends on
# SrsTarget joining the parts SrsPartTarget
-# SrsTemplateTarget
# SrsPartTarget preprocessing SrsPartMergeTarget (with l10n)
# source file (without l10n)
-# SrsTemplateTarget handling templates SrsTemplatePartTarget
-# SrsTemplatePartTarget handling template SrsPartMergeTarget
# SrsPartMergeTarget merging/transex source file (only needed with l10n)
# Overview of dependencies and tasks of AllLangResTarget
@@ -119,97 +116,6 @@ endif
endef
-# SrsTemplatePartTarget class
-
-define gb_SrsTemplatePartTarget_SrsTemplatePartTarget
-$(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
- $$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $$(dir $$@) && \
- cp $$< $$@)
-ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(2))
-endif
-
-endef
-
-# SrsTemplateTarget class
-#
-# This class handles src templates.
-#
-# Templates are src files that contain only macros that are then used
-# from other src files, but these macros contain translatable strings.
-# Because the processing of src files is done in two phases: 1/
-# localization and 2/ merging, templates must be translated
-# independently from the src files that include them. Special care must
-# be taken to ensure that the right file (i.e., the localized one) is
-# included; in order to do that, the templates in the source tree are
-# called foo_tmpl.src, but the localization phase produces foo.src, and
-# these names (i.e., without the _tmpl suffix) must be placed in
-# #include statements in other src files.
-
-define gb_SrsTemplateTarget__command
- $(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- touch $(1))
-endef
-
-# This machinery ensures that templates are regenerated when switching
-# from localized to unlocalized configuration and back.
-#
-# How it works:
-# We let _get_target depend on _get_update_target, so after they are
-# done, _get_target is newer than _get_update_target. If
-# gb_WITH_LANG changes (from nonempty to empty or the other way around),
-# _get_target and _get_update_target are switched, therefore _get_target
-# is now _older_ than _get_update_target and must be regenerated :-)
-gb_SrsTemplateTarget__get_merged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_merged_last
-gb_SrsTemplateTarget__get_unmerged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_unmerged_last
-
-ifeq ($(strip $(gb_WITH_LANG)),)
-gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
-gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1))
-else
-gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1))
-gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
-endif
-
-define gb_SrsTemplateTarget_SrsTemplateTarget
-$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS :=
-$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS :=
-$(call gb_SrsTemplateTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget__get_target,$(1))
-$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
-
-endef
-
-.PHONY : $(call gb_SrsTemplateTarget_get_target,%_last)
-$(call gb_SrsTemplateTarget_get_target,%_last) :
- $(call gb_SrsTemplateTarget__command,$@)
-
-.PHONY : $(call gb_SrsTemplateTarget_get_target,%)
-$(call gb_SrsTemplateTarget_get_target,%) :
- $(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(true),SRT,4))
- $(call gb_SrsTemplateTarget__command,$@)
-
-.PHONY : $(call gb_SrsTemplateTarget_get_clean_target,%)
-$(call gb_SrsTemplateTarget_get_clean_target,%) :
- $(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(false),SRT,4))
- -$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_SrsTemplateTarget_get_target,$*) \
- $(call gb_SrsTemplateTarget__get_merged_target,$*) \
- $(call gb_SrsTemplateTarget__get_unmerged_target,$*) \
- $(foreach part,$(PARTS),$(call gb_SrsTemplatePartTarget_get_target,$(part))) \
- $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
-
-define gb_SrsTemplateTarget_add_file
-$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2),$(3))
-$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS += $(2)
-$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS += $(2)
-$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplatePartTarget_get_target,$(2))
-$(call gb_SrsTemplatePartTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
-
-endef
-
# SrsTarget class
gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
@@ -258,13 +164,10 @@ $(call gb_SrsTarget_get_dep_target,%) : \
endif
define gb_SrsTarget_SrsTarget
-$(call gb_SrsTemplateTarget_SrsTemplateTarget,$(1))
$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(gb_SrsTarget_DEFAULTDEFS)
$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS :=
$(call gb_SrsTarget_get_target,$(1)) : PARTS :=
-$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(1))
-$(call gb_SrsTarget_get_clean_target,$(1)) : $(call gb_SrsTemplateTarget_get_clean_target,$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SrsTarget_get_dep_target,$(1)) : PARTS :=
-include $(call gb_SrsTarget_get_dep_target,$(1))
@@ -295,7 +198,6 @@ endif
$(call gb_SrsPartTarget_SrsPartTarget,$(2),$(3))
$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTarget_get_headers_target,$(1))
-$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTemplateTarget_get_target,$(1))
$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
$(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
ifeq ($(gb_FULLDEPS),$(true))
@@ -331,50 +233,6 @@ $(foreach file,$(2),$(call gb_SrsTarget_add_nonlocalizable_file,$(1),$(file)))
endef
-define gb_SrsTarget_add_template
-$(call gb_SrsTemplateTarget_add_file,$(1),$(2),$(true))
-
-endef
-
-define gb_SrsTarget_add_templates
-$(foreach template,$(2),$(call gb_SrsTarget_add_template,$(1),$(template)))
-
-endef
-
-# Add a srs template that does not have any localizable content.
-# These files will be copied instead of parsing them with transex3.
-#
-# gb_SrsTarget_add_nonlocalizable_template srs template
-define gb_SrsTarget_add_nonlocalizable_template
-$(call gb_SrsTemplateTarget_add_file,$(1),$(2),$(false))
-
-endef
-
-# Add srs templates that do not have any localizable content.
-#
-# gb_SrsTarget_add_nonlocalizable_templates srs template(s)
-define gb_SrsTarget_add_nonlocalizable_templates
-$(foreach template,$(2),$(call gb_SrsTarget_add_nonlocalizable_template,$(1),$(template)))
-
-endef
-
-
-# Use templates built by another SrsTarget.
-#
-# gb_SrsTarget_use_srstarget srs other-srs
-define gb_SrsTarget_use_srstarget
-$(call gb_SrsTarget_get_headers_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(2))
-
-endef
-
-# Use templates built by other SrsTargets.
-#
-# gb_SrsTarget_use_srstargets srs other-srs(s)
-define gb_SrsTarget_use_srstargets
-$(foreach srstarget,$(2),$(call gb_SrsTarget_use_srstarget,$(1),$(srstarget)))
-
-endef
-
# ResTarget
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index adfd3a7..9c15d8e 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -153,9 +153,6 @@ gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_headers_target = $(WORKDIR)/SrsTarget/$(1).headers
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
-gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
-gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
-gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
gb_UIConfig_get_imagelist_target = $(WORKDIR)/UIConfig/$(1).ilst
gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1).done
@@ -277,7 +274,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
ScpTemplateTarget \
SdiTarget \
SrsTarget \
- SrsTemplateTarget \
StaticLibrary \
ThesaurusIndexTarget \
CppunitTest \
diff --git a/solenv/gbuild/extensions/post_Counters.mk b/solenv/gbuild/extensions/post_Counters.mk
index 64f8173..afd2875 100644
--- a/solenv/gbuild/extensions/post_Counters.mk
+++ b/solenv/gbuild/extensions/post_Counters.mk
@@ -8,8 +8,6 @@
ifneq ($(filter countoutdated,$(MAKECMDGOALS)),)
-gb_SrsTarget_add_template=
-gb_SrsTarget_add_templates=
gb_Output_announce=
ifneq ($(strip $(filter-out countoutdated,$(MAKECMDGOALS))),)
commit 3c84fd27e898fbf872e415620e1f90f755c5f561
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 15:01:58 2016 +0100
drop now-needless deps
Change-Id: I2ef0b873a58710de399889cee3abf6b6ecf4fb1e
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index e1d047c..b2d6f0f 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,basctl,\
$(eval $(call gb_SrsTarget_SrsTarget,basctl/res))
-$(eval $(call gb_SrsTarget_use_srstargets,basctl/res,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,basctl/res,\
-I$(SRCDIR)/basctl/inc \
-I$(SRCDIR)/basctl/source/inc \
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 5f65785..c04396b 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbu,\
$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu))
-$(eval $(call gb_SrsTarget_use_srstargets,dbaccess/dbu,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
$$(INCLUDE) \
-I$(SRCDIR)/dbaccess/inc \
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 9e7eb38..65c93a2 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,rpt,\
$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
-$(eval $(call gb_SrsTarget_use_srstargets,reportdesign/res,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
$$(INCLUDE) \
-I$(SRCDIR)/reportdesign/source/core/inc \
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index a02e33a..c0e799d 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui))
$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
-$(eval $(call gb_SrsTarget_use_srstargets,reportdesign/rptui,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
$$(INCLUDE) \
-I$(SRCDIR)/reportdesign/source/ui/inc \
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 7b4620f..ee5c63e 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -16,10 +16,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sc,\
$(eval $(call gb_SrsTarget_SrsTarget,sc/res))
-$(eval $(call gb_SrsTarget_use_srstargets,sc/res,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,sc/res,\
$$(INCLUDE) \
-I$(SRCDIR)/sc/inc \
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 52d883f..673a842 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sd,\
$(eval $(call gb_SrsTarget_SrsTarget,sd/res))
-$(eval $(call gb_SrsTarget_use_srstargets,sd/res,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,sd/res,\
$$(INCLUDE) \
-I$(SRCDIR)/sd/inc \
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index 2f51a40..3a26c9d 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -18,10 +18,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sm,\
$(eval $(call gb_SrsTarget_SrsTarget,sm/res))
-$(eval $(call gb_SrsTarget_use_srstargets,sm/res,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,sm/res,\
-I$(SRCDIR)/starmath/inc \
$$(INCLUDE) \
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f79a012..6c2d839 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sw,\
$(eval $(call gb_SrsTarget_SrsTarget,sw/res))
-$(eval $(call gb_SrsTarget_use_srstargets,sw/res,\
- svx/res \
-))
-
$(eval $(call gb_SrsTarget_set_include,sw/res,\
$$(INCLUDE) \
-I$(SRCDIR)/sw/inc \
commit 6ea8411f2a149f4f28be12b1bd22c42ee2f6a274
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 14:55:42 2016 +0100
remove remaining uses of gb_SrsTemplateTarget_get_target
Change-Id: I5ddf0ba5fc289a124b39b9c14b7f5fdd3d7b54a4
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 66f8b5a..e1d047c 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_SrsTarget_use_srstargets,basctl/res,\
))
$(eval $(call gb_SrsTarget_set_include,basctl/res,\
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
-I$(SRCDIR)/basctl/inc \
-I$(SRCDIR)/basctl/source/inc \
-I$(SRCDIR)/basctl/source/basicide \
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index acb7c69..c80d68b 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
-I$(SRCDIR)/chart2/source/controller/inc \
-I$(SRCDIR)/chart2/source/controller/main \
-I$(SRCDIR)/chart2/source/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,chart2) \
))
$(eval $(call gb_SrsTarget_add_files,chart2/res,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 2930403..d97e39e 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_Library_set_include,dbu,\
-I$(SRCDIR)/dbaccess/inc \
-I$(SRCDIR)/dbaccess/source/inc \
-I$(SRCDIR)/dbaccess/source/ui/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 9063108..7b4620f 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\
-I$(SRCDIR)/sc/source/ui/pagedlg \
-I$(SRCDIR)/sc/source/ui/dbgui \
-I$(SRCDIR)/sc/source/ui/formdlg \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
))
$(eval $(call gb_SrsTarget_add_files,sc/res,\
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 7e137f4..52d883f 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -26,8 +26,6 @@ $(eval $(call gb_SrsTarget_set_include,sd/res,\
-I$(SRCDIR)/sd/inc \
-I$(SRCDIR)/sd/source/ui/inc \
-I$(SRCDIR)/sd/source/ui/slidesorter/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,sd) \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
))
$(eval $(call gb_SrsTarget_add_files,sd/res,\
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index a63fbd4..2f51a40 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_SrsTarget_use_srstargets,sm/res,\
$(eval $(call gb_SrsTarget_set_include,sm/res,\
-I$(SRCDIR)/starmath/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
$$(INCLUDE) \
))
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ce52e54..f79a012 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
-I$(SRCDIR)/sw/source/ui/utlui \
-I$(SRCDIR)/sw/source/ui/web \
-I$(SRCDIR)/sw/source/ui/wrtsh \
- -I$(call gb_SrsTemplateTarget_get_include_dir,sw) \
))
$(eval $(call gb_SrsTarget_add_files,sw/res,\
commit d795f83695b4e741fe453b9ca14b64df4ef4b6aa
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 13:31:04 2016 +0100
expand src templates
Change-Id: Id35caa8b8ed0c2f7e4d868f5c87a2a0f331cb352
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 955a7aa..5f65785 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
$$(INCLUDE) \
-I$(SRCDIR)/dbaccess/inc \
-I$(SRCDIR)/dbaccess/source/ui/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
))
$(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index b59bee5..662d702 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "dbu_app.hrc"
-#include <svx/globlmn.hrc>
#include <sfx2/cntids.hrc>
#include "browserids.hxx"
#include "dbaccess_helpid.hrc"
@@ -153,11 +152,15 @@ Menu RID_MENU_APP_EDIT
{
MenuItem
{
- ITEM_EDIT_COPY
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
};
MenuItem
{
- ITEM_EDIT_PASTE
+ Identifier = SID_PASTE ;
+ Command = ".uno:Paste" ;
+ Text [ en-US ] = "~Paste" ;
};
MenuItem
{
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 98793ae..dcd75df 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -19,7 +19,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_brw.hrc"
#include "browserids.hxx"
-#include <svx/globlmn.hrc>
String STR_QUERY_BRW_DELETE_ROWS
{
@@ -87,7 +86,11 @@ Menu MENU_BROWSER_DEFAULTCONTEXT
{ \
Separator = TRUE; \
}; \
- MenuItem { ITEM_EDIT_COPY };
+ MenuItem {
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
+ };
MenuItem \
{ \
Separator = TRUE; \
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 07d236a..375e58b 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 <svx/globlmn.hrc>
Menu RID_SBA_GRID_COLCTXMENU
{
@@ -65,7 +64,9 @@ Menu RID_SBA_GRID_ROWCTXMENU
};
MenuItem
{
- ITEM_EDIT_COPY
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
};
};
};
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index ea29a56..e675f09 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -18,7 +18,6 @@
*/
#include "dbu_qry.hrc"
#include "Query.hrc"
-#include <svx/globlmn.hrc>
#include <sfx2/cntids.hrc>
#include "browserids.hxx"
#include "dbaccess_helpid.hrc"
@@ -29,7 +28,9 @@ Menu RID_MENU_JOINVIEW_CONNECTION
{
MenuItem
{
- ITEM_EDIT_DELETE
+ Identifier = SID_DELETE ;
+ Command = ".uno:Delete" ;
+ Text [ en-US ] = "~Delete" ;
};
MenuItem
{
@@ -46,7 +47,9 @@ Menu RID_MENU_JOINVIEW_TABLE
{
MenuItem
{
- ITEM_EDIT_DELETE
+ Identifier = SID_DELETE ;
+ Command = ".uno:Delete" ;
+ Text [ en-US ] = "~Delete" ;
};
};
};
@@ -67,7 +70,9 @@ Menu RID_QUERYCOLPOPUPMENU
};
MenuItem
{
- ITEM_EDIT_DELETE
+ Identifier = SID_DELETE ;
+ Command = ".uno:Delete" ;
+ Text [ en-US ] = "~Delete" ;
};
};
};
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
index a74275e..65087f5 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "dbu_rel.hrc"
-#include <svx/globlmn.hrc>
#include <sfx2/cntids.hrc>
#include "browserids.hxx"
#include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index f4bc2a1..90a4e0c 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -21,7 +21,6 @@
#include "dbaccess_helpid.hrc"
#include "dbaccess_slotid.hrc"
#include "browserids.hxx"
-#include <svx/globlmn.hrc>
String STR_TABLEDESIGN_DBFIELDTYPES
{
@@ -140,19 +139,27 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
{
MenuItem
{
- ITEM_EDIT_CUT
+ Identifier = SID_CUT ;
+ Command = ".uno:Cut" ;
+ Text [ en-US ] = "Cu~t" ;
};
MenuItem
{
- ITEM_EDIT_COPY
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
};
MenuItem
{
- ITEM_EDIT_PASTE
+ Identifier = SID_PASTE ;
+ Command = ".uno:Paste" ;
+ Text [ en-US ] = "~Paste" ;
};
MenuItem
{
- ITEM_EDIT_DELETE
+ Identifier = SID_DELETE ;
+ Command = ".uno:Delete" ;
+ Text [ en-US ] = "~Delete" ;
};
MenuItem
{
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 31b11e94..e9130af 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -86,8 +86,7 @@ bool passesNegativeList(const OUString& rUrl) {
bool passesPositiveList(const OUString& rUrl) {
static const AsciiString list[] = {
- { RTL_CONSTASCII_STRINGPARAM("/description.xml") },
- { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }
+ { RTL_CONSTASCII_STRINGPARAM("/description.xml") }
};
return matchList(rUrl, list, SAL_N_ELEMENTS(list));
}
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 2d2a5a1..9e7eb38 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_SrsTarget_use_srstargets,reportdesign/res,\
$(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
$$(INCLUDE) \
-I$(SRCDIR)/reportdesign/source/core/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
))
$(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 742b2b1..a02e33a 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
$$(INCLUDE) \
-I$(SRCDIR)/reportdesign/source/ui/inc \
-I$(SRCDIR)/reportdesign/inc \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
))
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index 529ffee..9d602e0 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -19,7 +19,6 @@
#include "CondFormat.hrc"
#include "RptResId.hrc"
#include "helpids.hrc"
-#include <svx/globlmn.hrc>
#include "rptui_slotid.hrc"
String STR_NUMBERED_CONDITION
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index 25ead95..47c177d 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -18,7 +18,6 @@
*/
#include "RptResId.hrc"
#include "helpids.hrc"
-#include <svx/globlmn.hrc>
#include <svx/svxids.hrc>
String STR_RPT_EXPRESSION
@@ -117,7 +116,9 @@ Menu RID_GROUPSROWPOPUPMENU
{
MenuItem
{
- ITEM_EDIT_DELETE
+ Identifier = SID_DELETE ;
+ Command = ".uno:Delete" ;
+ Text [ en-US ] = "~Delete" ;
};
};
};
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index c6471f6..8e9cc145 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -19,7 +19,6 @@
#include "RptResId.hrc"
#include "helpids.hrc"
#include "rptui_slotid.hrc"
-#include <svx/globlmn.hrc>
#include <svx/svxids.hrc>
#include <svl/solar.hrc>
@@ -119,7 +118,9 @@ Menu RID_MENU_NAVIGATOR
};
MenuItem
{
- ITEM_EDIT_DELETE
+ Identifier = SID_DELETE ;
+ Command = ".uno:Delete" ;
+ Text [ en-US ] = "~Delete" ;
};
};
};
diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src
index 1d93255..be120f6 100644
--- a/reportdesign/source/ui/dlg/PageNumber.src
+++ b/reportdesign/source/ui/dlg/PageNumber.src
@@ -18,7 +18,6 @@
*/
#include "RptResId.hrc"
#include "helpids.hrc"
-#include <svx/globlmn.hrc>
#include <svx/svxids.hrc>
String STR_RPT_PN_PAGE
diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src
index 715871d..1876009 100644
--- a/reportdesign/source/ui/inspection/inspection.src
+++ b/reportdesign/source/ui/inspection/inspection.src
@@ -18,7 +18,6 @@
*/
#include "RptResId.hrc"
#include "rptui_slotid.hrc"
-#include <svx/globlmn.hrc>
#include <svx/svxids.hrc>
String RID_STR_PROPPAGE_DEFAULT
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index a4d1e9a..6a88af8 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -18,7 +18,6 @@
*/
#include "RptResId.hrc"
#include "rptui_slotid.hrc"
-#include <svx/globlmn.hrc>
#include <svx/svxids.hrc>
#include "helpids.hrc"
@@ -525,15 +524,21 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- ITEM_EDIT_CUT
+ Identifier = SID_CUT ;
+ Command = ".uno:Cut" ;
+ Text [ en-US ] = "Cu~t" ;
};
MenuItem
{
- ITEM_EDIT_COPY
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
};
MenuItem
{
- ITEM_EDIT_PASTE
+ Identifier = SID_PASTE ;
+ Command = ".uno:Paste" ;
+ Text [ en-US ] = "~Paste" ;
};
};
};
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 6ed5890..d9c98a8 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -18,7 +18,6 @@
*/
#include "sc.hrc"
-#include <svx/globlmn.hrc>
String SCSTR_QHELP_POSWND
{
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 50872d9..a0a5126 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -18,7 +18,6 @@
*/
#include <sfx2/sfx.hrc>
-#include <svx/globlmn.hrc>
#include "starmath.hrc"
String RID_FONTREGULAR
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index 65e2af9..4bf44fd 100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -18,7 +18,6 @@
*/
#include <sfx2/sfx.hrc>
-#include <svx/globlmn.hrc>
#include "starmath.hrc"
#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index bb104d6..271a06b 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
$(eval $(call gb_SrsTarget_set_include,svx/res,\
$$(INCLUDE) \
- -I$(call gb_SrsTemplateTarget_get_include_dir,svx) \
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/source/dialog \
-I$(SRCDIR)/svx/inc/ \
@@ -87,8 +86,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,svx/res,\
svx/source/unodraw/unodraw.src \
))
-$(eval $(call gb_SrsTarget_add_templates,svx/res,\
- svx/inc/globlmn_tmpl.hrc \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index c26ad8f..1b6dd61 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -55,6 +55,5 @@ endif
#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
-#todo: globlmn.hrc
#todo: component file
# vim: set noet sw=4 ts=4:
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
deleted file mode 100644
index 85ae57d..0000000
--- a/svx/inc/globlmn_tmpl.hrc
+++ /dev/null
@@ -1,48 +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 _GLOBLMN_HRC
-#define _GLOBLMN_HRC
-
-/*------------------------------------------------------------------------
- Menu-IDs
-------------------------------------------------------------------------*/
-#define ITEM_EDIT_CUT \
- Identifier = SID_CUT ; \
- Command = ".uno:Cut" ; \
- Text [ en-US ] = "Cu~t" ;\
-
-#define ITEM_EDIT_COPY \
- Identifier = SID_COPY ; \
- Command = ".uno:Copy" ; \
- Text [ en-US ] = "~Copy" ;\
-
-#define ITEM_EDIT_DELETE \
- Identifier = SID_DELETE ; \
- Command = ".uno:Delete" ; \
- Text [ en-US ] = "~Delete" ;\
-
-#define ITEM_EDIT_PASTE \
- Identifier = SID_PASTE ; \
- Command = ".uno:Paste" ; \
- Text [ en-US ] = "~Paste" ; \
-
-#endif // #ifndef _GLOBLMN_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 96808f9..112f77f 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -19,7 +19,6 @@
#include "svx/fmresids.hrc"
#include <svx/svxids.hrc>
-#include "globlmn.hrc"
#include "fmhelp.hrc"
#include <svx/svxcommands.h>
@@ -192,7 +191,9 @@ Menu RID_SVXMNU_CELL
{
MenuItem
{
- ITEM_EDIT_COPY
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
};
};
};
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 82b18a3..1d0b0dd 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -18,7 +18,6 @@
*/
#include "datanavi.hrc"
-#include "globlmn.hrc"
#include "svx/dialogs.hrc"
#include "svx/fmresids.hrc"
#include "fmhelp.hrc"
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 822428c..078e1df 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -19,7 +19,6 @@
#include <svx/svxids.hrc>
#include "svx/fmresids.hrc"
-#include "globlmn.hrc"
#include <svx/svxcommands.h>
#include "fmhelp.hrc"
@@ -57,9 +56,21 @@ Menu RID_FMEXPLORER_POPUPMENU
HelpId = CMD_SID_FM_CHANGECONTROLTYPE ;
Text [ en-US ] = "Replace with";
};
- MenuItem { ITEM_EDIT_CUT };
- MenuItem { ITEM_EDIT_COPY };
- MenuItem { ITEM_EDIT_PASTE };
+ MenuItem {
+ Identifier = SID_CUT ;
+ Command = ".uno:Cut" ;
+ Text [ en-US ] = "Cu~t" ;
+ };
+ MenuItem {
+ Identifier = SID_COPY ;
+ Command = ".uno:Copy" ;
+ Text [ en-US ] = "~Copy" ;
+ };
+ MenuItem {
+ Identifier = SID_PASTE ;
+ Command = ".uno:Paste" ;
+ Text [ en-US ] = "~Paste" ;
+ };
MenuItem
{
Identifier = SID_FM_DELETE ;
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 84d833d..ce52e54 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
-I$(SRCDIR)/sw/source/ui/utlui \
-I$(SRCDIR)/sw/source/ui/web \
-I$(SRCDIR)/sw/source/ui/wrtsh \
- -I$(call gb_SrsTemplateTarget_get_include_dir,) \
-I$(call gb_SrsTemplateTarget_get_include_dir,sw) \
))
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index b73d10c..74c3ce1 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -20,7 +20,6 @@
#include <svl/style.hrc>
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
-#include <svx/globlmn.hrc>
#include "cmdid.h"
#include "access.hrc"
#include "globals.hrc"
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 42b01e4..3bc37bb 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -18,7 +18,6 @@
*/
#include <svx/dialogs.hrc>
-#include <svx/globlmn.hrc>
#include "cmdid.h"
#include "app.hrc"
#include "globals.hrc"
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 8db9032..d8ac163 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svx/svxids.hrc>
-#include <svx/globlmn.hrc>
#include "helpid.h"
#include "shells.hrc"
#include "globals.hrc"
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index 4c4b2a9c..ba22b8b 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -18,7 +18,6 @@
*/
#include <svx/svxids.hrc>
-#include <svx/globlmn.hrc>
#include "globals.hrc"
#include "workctrl.hrc"
#include "helpid.h"
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index 55b3640..edb839f 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -18,7 +18,6 @@
*/
#include <svx/svxids.hrc>
-#include <svx/globlmn.hrc>
#include "view.hrc"
#include "shells.hrc"
#include "globals.hrc"
commit 24905f42b9efb381e7ccd43c0ab98facf5149af3
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 13:19:17 2016 +0100
expand src templates
Change-Id: I13afaa9d0c7c9b46b3ebaedf299de41bed551e7c
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 060743e..955a7aa 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 cca23a0..b59bee5 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 b7b605e..98793ae 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 3e3531b..07d236a 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 13b96d4..4d09f3b 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 679b044..0000000
--- 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 27ef7d8..ea29a56 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 a191b34..f4bc2a1 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
{
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index ad8e471..31b11e94 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -86,8 +86,6 @@ bool passesNegativeList(const OUString& rUrl) {
bool passesPositiveList(const OUString& rUrl) {
static const AsciiString list[] = {
- { RTL_CONSTASCII_STRINGPARAM(
- "/dbaccess/source/ui/inc/toolbox_tmpl.hrc") },
{ RTL_CONSTASCII_STRINGPARAM("/description.xml") },
{ RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }
};
More information about the Libreoffice-commits
mailing list