summaryrefslogtreecommitdiff
path: root/helpcontent2/util
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/util')
-rw-r--r--helpcontent2/util/sbasic/makefile.mk6
-rw-r--r--helpcontent2/util/scalc/makefile.mk6
-rw-r--r--helpcontent2/util/schart/makefile.mk6
-rw-r--r--helpcontent2/util/sdatabase/makefile.mk6
-rw-r--r--helpcontent2/util/sdraw/makefile.mk6
-rw-r--r--helpcontent2/util/shared/makefile.mk6
-rw-r--r--helpcontent2/util/simpress/makefile.mk6
-rw-r--r--helpcontent2/util/smath/makefile.mk6
-rw-r--r--helpcontent2/util/swriter/makefile.mk6
-rw-r--r--[-rwxr-xr-x]helpcontent2/util/target.pmk10
10 files changed, 33 insertions, 31 deletions
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index 91595fefe0..3f0ee12cf5 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_sbasic
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_sbasic
@@ -50,13 +50,13 @@ LINKNAME=sbasic
LINKADDEDFILES= \
-add sbasic.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sbasic.cfg \
-add sbasic.tree $(COMMONMISC)$/LANGUAGE$/sbasic.tree \
- -add sbasic.jar $(BIN)$/xhp_sbasic_LANGUAGE.zip
+ -add sbasic.jar $(COMMONBIN)$/xhp_sbasic_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/sbasic.cfg \
$(COMMONMISC)$/LANGUAGE$/sbasic.tree \
- $(BIN)$/xhp_sbasic_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_sbasic_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index 124fd3acdf..f3d6a23a86 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_scalc
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_scalc
@@ -50,13 +50,13 @@ LINKNAME=scalc
LINKADDEDFILES= \
-add scalc.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \
-add scalc.tree $(COMMONMISC)$/LANGUAGE$/scalc.tree \
- -add scalc.jar $(BIN)$/xhp_scalc_LANGUAGE.zip
+ -add scalc.jar $(COMMONBIN)$/xhp_scalc_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \
$(COMMONMISC)$/LANGUAGE$/scalc.tree \
- $(BIN)$/xhp_scalc_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_scalc_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 53682fdfd9..80264b8dd7 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_schart
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_schart
@@ -50,13 +50,13 @@ LINKNAME=schart
LINKADDEDFILES= \
-add schart.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/schart.cfg \
-add schart.tree $(COMMONMISC)$/LANGUAGE$/schart.tree \
- -add schart.jar $(BIN)$/xhp_schart_LANGUAGE.zip
+ -add schart.jar $(COMMONBIN)$/xhp_schart_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/schart.cfg \
$(COMMONMISC)$/LANGUAGE$/schart.tree \
- $(BIN)$/xhp_schart_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_schart_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 7019a8a003..d80596bdc9 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_sdatabase
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_sdatabase
@@ -49,12 +49,12 @@ ZIP1LIST=$(LANGDIR)$/text$/shared$/explorer$/database$/main.xhp
LINKNAME=sdatabase
LINKADDEDFILES= \
-add sdatabase.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg \
- -add sdatabase.jar $(BIN)$/xhp_sdatabase_LANGUAGE.zip
+ -add sdatabase.jar $(COMMONBIN)$/xhp_sdatabase_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg \
- $(BIN)$/xhp_sdatabase_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_sdatabase_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index 83c6b21ba3..38e29beaed 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_sdraw
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_sdraw
@@ -49,12 +49,12 @@ ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x
LINKNAME=sdraw
LINKADDEDFILES= \
-add sdraw.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg \
- -add sdraw.jar $(BIN)$/xhp_sdraw_LANGUAGE.zip
+ -add sdraw.jar $(COMMONBIN)$/xhp_sdraw_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg \
- $(BIN)$/xhp_sdraw_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_sdraw_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk
index 76237f68ad..35581be8be 100644
--- a/helpcontent2/util/shared/makefile.mk
+++ b/helpcontent2/util/shared/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_shared
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_shared
@@ -49,7 +49,7 @@ ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x
LINKNAME=shared
LINKADDEDFILES= \
-add shared.tree $(COMMONMISC)$/LANGUAGE$/shared.tree \
- -add shared.jar $(BIN)$/xhp_shared_LANGUAGE.zip \
+ -add shared.jar $(COMMONBIN)$/xhp_shared_LANGUAGE.zip \
-add default.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/default.css \
-add highcontrast1.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast1.css \
-add highcontrast2.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast2.css \
@@ -60,7 +60,7 @@ LINKADDEDFILES= \
LINKADDEDDEPS= \
$(COMMONMISC)$/LANGUAGE$/shared.tree \
- $(BIN)$/xhp_shared_LANGUAGE.zip \
+ $(COMMONBIN)$/xhp_shared_LANGUAGE.zip \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/default.css \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast1.css \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast2.css \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index cb30520156..9fc38e1c9f 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_simpress
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_simpress
@@ -50,13 +50,13 @@ LINKNAME=simpress
LINKADDEDFILES= \
-add simpress.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/simpress.cfg \
-add simpress.tree $(COMMONMISC)$/LANGUAGE$/simpress.tree \
- -add simpress.jar $(BIN)$/xhp_simpress_LANGUAGE.zip
+ -add simpress.jar $(COMMONBIN)$/xhp_simpress_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/simpress.cfg \
$(COMMONMISC)$/LANGUAGE$/simpress.tree \
- $(BIN)$/xhp_simpress_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_simpress_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 5ac5441526..63b2833794 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_smath
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_smath
@@ -50,13 +50,13 @@ LINKNAME=smath
LINKADDEDFILES= \
-add smath.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
-add smath.tree $(COMMONMISC)$/LANGUAGE$/smath.tree \
- -add smath.jar $(BIN)$/xhp_smath_LANGUAGE.zip
+ -add smath.jar $(COMMONBIN)$/xhp_smath_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
$(COMMONMISC)$/LANGUAGE$/smath.tree \
- $(BIN)$/xhp_smath_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_smath_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 96107423df..c3eb209631 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -38,7 +38,7 @@ TARGET = util_swriter
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-common_build_zip:=
+#common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_swriter
@@ -50,13 +50,13 @@ LINKNAME=swriter
LINKADDEDFILES= \
-add swriter.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \
-add swriter.tree $(COMMONMISC)$/LANGUAGE$/swriter.tree \
- -add swriter.jar $(BIN)$/xhp_swriter_LANGUAGE.zip
+ -add swriter.jar $(COMMONBIN)$/xhp_swriter_LANGUAGE.zip
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \
$(COMMONMISC)$/LANGUAGE$/swriter.tree \
- $(BIN)$/xhp_swriter_LANGUAGE.zip
+ $(COMMONBIN)$/xhp_swriter_LANGUAGE.zip
LINKLINKFILES= \
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index e162c80c74..c5649de4dc 100755..100644
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-LINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(BIN)$/$(LINKNAME)_$i.zip)
+LINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(COMMONBIN)$/$(LINKNAME)_$i.zip)
LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES)))
ALLTAR : $(LINKALLTARGETS)
@@ -35,12 +35,14 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
.ENDIF
$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst
- $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+ $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH))
.IF "$(SOLAR_JAVA)" == "TRUE"
- $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsandsegname _0 _3
+ $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@.$(INPATH) -checkcfsandsegname _0 _3
+ $(RENAME) $@.$(INPATH) $@
.ELSE
-$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.*
-$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.*
- zip -j -D $@ $(MISC)$/ziptmp$(@:b)$/*
+ zip -j -D $@.$(INPATH) $(MISC)$/ziptmp$(@:b)$/*
+ $(RENAME) $@.$(INPATH) $@
-$(RM) $(MISC)$/ziptmp$(@:b)$/*.*
.ENDIF
generated by cgit (git 2.34.1) at 2025-02-02 03:42:35 +0000
tion value='private/mmeeks/bitmapcrc64'>private/mmeeks/bitmapcrc64 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/cppcanvas/source/wrapper/implsprite.cxx
AgeCommit message (Collapse)Author
2023-09-22tdf#146619 Recheck include/c* with IWYUGabor Kelemen
Change-Id: I0cf6f675483bddf82e7347b484a874c71963bfd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156984 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
2022-06-02clang-tidy modernize-pass-by-value in cppcanvasNoel Grandin
Change-Id: I01e638c468f0941e042a839f73801a3ae3cb022a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135310 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-28clang-tidy:readability-redundant-member-initNoel Grandin
Change-Id: I48e6fb31df732805423b89ed91b6e4363a69b668 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121150 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-28Make loplugin:simplifypointertobool handle parenthesized expressionsStephan Bergmann
...as discussed as an open TODO in the commit message of fe6cce01c88d045a1fcf09acf049c34c22299b02 "Fix loplugin:simplifypointertobool for libstdc++ std::shared_ptr". The necessary changes across the code base have been done fully automatically with the rewriting plugin on Linux. (All those changes apparently involve uses of macro arguments wrapped in parentheses in the macro body, but always in conditionally-converted-to-bool contexts. In other contexts, such automatic rewriting would add the "bool" to the macro body, which would be wrong in general, but we apparently get away with that sloppy coding for now.) The parenExprs_ stack that fe6cce01c88d045a1fcf09acf049c34c22299b02 had introduced to treat such (then-undetected, it had turned out) parenthesized cases now turns out to not be needed after all. Change-Id: I2021f61c2e2805be7e18b38edf8744d186cac3cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95010 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-17loplugin:flatten in cppcanvasNoel Grandin
Change-Id: I4303c31ad3de1ba71aa366b6dc203504b8fffd77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92453 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-31new loplugin:namespaceindentationNoel Grandin
check indentation of braces in namespace decls, and the comments that often appear with them. This is my penance for messing up the indentation with clang-tidy-modernize-namespaces. As such I have limited it to new-style namespaces for now, and the check is off by default. Change-Id: I4db7f10a81c79bc0eece8f8e3ee564da8bc7f168 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87723 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-15clang-tidy modernize-concat-nested-namespace in cppcanvas..cppuhelperNoel Grandin
Change-Id: I0bb4ea91288a15fb590d077fb390c53be8b50400 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86801 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-31tdf#42949 Fix IWYU warnings in cppcanvas/Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I3e6b35acf6266157d4cf634e2143e6e19a73102a Reviewed-on: https://gerrit.libreoffice.org/81813 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2017-09-26Rename the basegfx::tools namespace to basegfx::utilsTor Lillqvist
Reduce potential confusion with the global tools namespace. Will hopefully make it possible to remove the annoying initial :: when referring to the global tools namespace. Unless we have even more tools subnamespaces somewhere. Thorsten said it was OK. Change-Id: Id088dfe8f4244cb79df9aa988995b31a1758c996 Reviewed-on: https://gerrit.libreoffice.org/42644 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2016-11-03loplugin:unusedmethods unused return typesNoel Grandin
Change-Id: I88204bca60dd1e299b040c52bc87e500cbfaa930 Reviewed-on: https://gerrit.libreoffice.org/30519 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-02-22loplugin:write only fieldsNoel Grandin
Change-Id: I44f249a17d0a510ec63a488b656d57a1a392f821