cui/source/tabpages/tpbitmap.cxx | 33 +-
drawinglayer/source/processor2d/vclprocessor2d.cxx | 15 -
instsetoo_native/util/makefile.mk | 286 +++++++++++++++++----
svx/source/xoutdev/xattrbmp.cxx | 6
4 files changed, 273 insertions(+), 67 deletions(-)
New commits:
commit ebdc37c7a1371d1d6ed75f0c10c1d4cdc88e630f
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:34:46 2013 +0000
123532: Hide one warning about changes of %-target handling in dmake 4.5.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index d28b7cf..c608103 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -203,7 +203,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
# This macro makes calling the make_installer.pl script a bit easier.
# Just add -p and -msitemplate switches.
MAKE_INSTALLER_COMMAND= \
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
+ @$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
-f $(PRJ)$/util$/openoffice.lst \
-l $(subst,$(@:s/_/ /:1)_, $(@:b)) \
-u $(OUT) \
@@ -215,14 +215,23 @@ MAKE_INSTALLER_COMMAND=
\
# This macro makes calling gen_update_info.pl a bit easier
# Just add --product switches, and xml input file and redirect output.
GEN_UPDATE_INFO_COMMAND= \
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl \
+ @$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl \
--buildid $(BUILD) \
--arch "$(RTL_ARCH)" \
--os "$(RTL_OS)" \
--lstfile $(PRJ)$/util$/openoffice.lst \
--languages $(subst,$(@:s/_/ /:1)_, $(@:b))
-openoffice_%{$(PKGFORMAT:^".") .archive} :
+openoffice_%{$(PKGFORMAT:^".")} :
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+openoffice_%{.archive} :
$(MAKE_INSTALLER_COMMAND) \
-p Apache_OpenOffice \
-msitemplate $(MSIOFFICETEMPLATEDIR)
commit 440bd20976d8402e3a35dd1694d99f8be68e9701
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:32:59 2013 +0000
123532: Renamed hack_msitemplates target to msitemplates.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index d967598..d28b7cf 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -169,7 +169,7 @@ MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
.IF "$(OS)" == "WNT"
-ADDDEPS+=hack_msitemplates
+ADDDEPS+=msitemplates
.ENDIF
$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
@@ -293,7 +293,7 @@ $(BIN)$/dev$/intro.zip :
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-hack_msitemplates .PHONY: msi_template_files msi_langpack_template_files
msi_sdk_template_files
+msitemplates .PHONY: msi_template_files msi_langpack_template_files
msi_sdk_template_files
MSI_OFFICE_TEMPLATE_FILES= \
ActionTe.idt \
commit 10329bfb1e0c100bdb9d3c947049897b6432b602
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:31:19 2013 +0000
123532: Unhacked the hack_msitemplates target to msitemplates.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 6a58356..d967598 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -293,18 +293,161 @@ $(BIN)$/dev$/intro.zip :
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-hack_msitemplates .PHONY:
- -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
- -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
- -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
- -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
- -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
- -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
- $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
- $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
- $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.*
$(MSIOFFICETEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.*
$(MSILANGPACKTEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.*
$(MSISDKOOTEMPLATEDIR)$/Binary
-
-
+hack_msitemplates .PHONY: msi_template_files msi_langpack_template_files
msi_sdk_template_files
+
+MSI_OFFICE_TEMPLATE_FILES= \
+ ActionTe.idt \
+ AdminExe.idt \
+ AdminUIS.idt \
+ AdvtExec.idt \
+ AppSearc.idt \
+ Binary.idt \
+ CheckBox.idt \
+ Control.idt \
+ ControlC.idt \
+ ControlE.idt \
+ CustomAc.idt \
+ Dialog.idt \
+ Error.idt \
+ EventMap.idt \
+ InstallE.idt \
+ InstallU.idt \
+ LaunchCo.idt \
+ ListBox.idt \
+ Property.idt \
+ RadioBut.idt \
+ RegLocat.idt \
+ Signatur.idt \
+ TextStyl.idt \
+ UIText.idt \
+ _Validat.idt \
+ codes.txt \
+ codes_broo.txt \
+ codes_broodev.txt \
+ codes_ooodev.txt \
+ components.txt \
+ upgradecode_remove_ooo.txt \
+ Binary/Banner.bmp \
+ Binary/Image.bmp \
+ Binary/caution.ico \
+ Binary/dontinstall.ico \
+ Binary/install.ico \
+ Binary/installfirstuse.ico \
+ Binary/installpartial.ico \
+ Binary/installstatemenu.ico \
+ Binary/networkinstall.ico \
+ Binary/newfolder.ico \
+ Binary/openfolder.ico \
+ Binary/setup.ico \
+ Binary/setupcomplete.ico \
+ Binary/setuppartial.ico \
+ Binary/setuprepair.ico \
+ Binary/trashcan.ico \
+ Binary/up.ico
+
+MSI_LANGPACK_TEMPLATE_FILES= \
+ ActionTe.idt \
+ AdminExe.idt \
+ AdminUIS.idt \
+ AdvtExec.idt \
+ Binary.idt \
+ CheckBox.idt \
+ Control.idt \
+ ControlC.idt \
+ ControlE.idt \
+ CustomAc.idt \
+ Dialog.idt \
+ Error.idt \
+ EventMap.idt \
+ InstallE.idt \
+ InstallU.idt \
+ LaunchCo.idt \
+ ListBox.idt \
+ Property.idt \
+ RadioBut.idt \
+ TextStyl.idt \
+ UIText.idt \
+ _Validat.idt \
+ bro_patchcodes.txt \
+ brodev_patchcodes.txt \
+ codes.txt \
+ codes_broo.txt \
+ codes_ooodev.txt \
+ components.txt \
+ ooo_patchcodes.txt \
+ ooodev_patchcodes.txt \
+ Binary/Banner.bmp
+
+MSI_SDK_TEMPLATE_FILES= \
+ ActionTe.idt \
+ AdminExe.idt \
+ AdminUIS.idt \
+ AdvtExec.idt \
+ AppSearc.idt \
+ Binary.idt \
+ CheckBox.idt \
+ Control.idt \
+ ControlC.idt \
+ ControlE.idt \
+ CustomAc.idt \
+ Dialog.idt \
+ Error.idt \
+ EventMap.idt \
+ InstallE.idt \
+ InstallU.idt \
+ LaunchCo.idt \
+ ListBox.idt \
+ Property.idt \
+ RadioBut.idt \
+ RegLocat.idt \
+ Signatur.idt \
+ TextStyl.idt \
+ UIText.idt \
+ _Validat.idt \
+ codes.txt \
+ components.txt \
+ Binary/Banner.bmp \
+ Binary/Image.bmp \
+ Binary/caution.ico \
+ Binary/dontinstall.ico \
+ Binary/install.ico \
+ Binary/installfirstuse.ico \
+ Binary/installpartial.ico \
+ Binary/installstatemenu.ico \
+ Binary/networkinstall.ico \
+ Binary/newfolder.ico \
+ Binary/openfolder.ico \
+ Binary/setup.ico \
+ Binary/setupcomplete.ico \
+ Binary/setuppartial.ico \
+ Binary/setuprepair.ico \
+ Binary/trashcan.ico \
+ Binary/up.ico
+
+msi_template_files .PHONY: \
+ $(MSIOFFICETEMPLATEDIR) \
+ $(MSIOFFICETEMPLATEDIR)$/Binary \
+ $(MSIOFFICETEMPLATEDIR)$/{$(MSI_OFFICE_TEMPLATE_FILES)}
+$(MSIOFFICETEMPLATEDIR) $(MSIOFFICETEMPLATEDIR)$/Binary :
+ -$(MKDIRHIER) $@
+$(MSIOFFICETEMPLATEDIR)$/% : $(MSIOFFICETEMPLATESOURCE)$/%
+ $(GNUCOPY) $< $@
+
+msi_langpack_template_files .PHONY : \
+ $(MSILANGPACKTEMPLATEDIR) \
+ $(MSILANGPACKTEMPLATEDIR)$/Binary \
+ $(MSILANGPACKTEMPLATEDIR)$/{$(MSI_LANGPACK_TEMPLATE_FILES)}
+$(MSILANGPACKTEMPLATEDIR) $(MSILANGPACKTEMPLATEDIR)$/Binary :
+ -$(MKDIRHIER) $@
+$(MSILANGPACKTEMPLATEDIR)$/% : $(MSILANGPACKTEMPLATESOURCE)$/%
+ $(GNUCOPY) $< $@
+
+
+msi_sdk_template_files .PHONY : \
+ $(MSISDKOOTEMPLATEDIR) \
+ $(MSISDKOOTEMPLATEDIR)$/Binary \
+ $(MSISDKOOTEMPLATEDIR)$/{$(MSI_SDK_TEMPLATE_FILES)}
+$(MSISDKOOTEMPLATEDIR) $(MSISDKOOTEMPLATEDIR)$/Binary :
+ -$(MKDIRHIER) $@
+$(MSISDKOOTEMPLATEDIR)/% : $(MSISDKOOTEMPLATESOURCE)$/%
+ $(GNUCOPY) $< $@
commit 61723eb0b32e9b9a53e4b66496d5b72578811f07
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:30:26 2013 +0000
123532: Factored out MAKE_INSTALLER_COMMAND and GEN_UPDATE_INFO_COMMAND
macros.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index e50b681..6a58356 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -198,34 +198,71 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" &&
"$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
+
+
+# This macro makes calling the make_installer.pl script a bit easier.
+# Just add -p and -msitemplate switches.
+MAKE_INSTALLER_COMMAND= \
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
+ -f $(PRJ)$/util$/openoffice.lst \
+ -l $(subst,$(@:s/_/ /:1)_, $(@:b)) \
+ -u $(OUT) \
+ -buildid $(BUILD) \
+ -msilanguage $(MISC)$/win_ulffiles \
+ -format $(@:e:s/.//) \
+ $(VERBOSESWITCH)
+
+# This macro makes calling gen_update_info.pl a bit easier
+# Just add --product switches, and xml input file and redirect output.
+GEN_UPDATE_INFO_COMMAND= \
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl \
+ --buildid $(BUILD) \
+ --arch "$(RTL_ARCH)" \
+ --os "$(RTL_OS)" \
+ --lstfile $(PRJ)$/util$/openoffice.lst \
+ --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
+
openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch
"$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product
Apache_OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
$(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
openofficewithjre_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Aapche_OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate
$(MSIOFFICETEMPLATEDIR)
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
openofficedev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch
"$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product
Apache_OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
$(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice_Dev \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice_Dev \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooolanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack
-format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSILANGPACKTEMPLATEDIR) \
+ -languagepack
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack
-format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev -msitemplate
$(MSILANGPACKTEMPLATEDIR) -languagepack
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
sdkoo_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format
$(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_SDK -msitemplate
$(MSISDKOOTEMPLATEDIR) -dontstrip
$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format
$(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev_SDK -msitemplate
$(MSISDKOOTEMPLATEDIR) -dontstrip
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
commit e30007606216e9b549df0110d85c0c3af5b53401
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:29:22 2013 +0000
123532: Removed support for deprecated BUILD_SPECIAL flag.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 0fd18c4..e50b681 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -160,11 +160,6 @@
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
-.IF "$(BUILD_SPECIAL)"!=""
-MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
-MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
-.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
@@ -196,8 +191,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
-.ENDIF # "$(BUILD_SPECIAL)"!=""
-
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
commit bd35c43d07f349fa08b4645d4183eb3790962287
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:28:25 2013 +0000
123532: Added help target that prints a short documentation about available
targets.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 8538aba..0fd18c4 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -61,6 +61,26 @@ INSTALLDIR=$(OUT)
.INCLUDE: target.mk
+# The help target belongs after the inclusion of target.mk to not become the
default target.
+help .PHONY :
+ @echo "known targets:"
+ @echo " openoffice builds the default installation packages
for the platform"
+ @echo " aoo_srcrelease packs the source release package"
+ @echo " updatepack"
+ @echo " openofficedev devloper snapshot"
+ @echo " openofficewithjre"
+ @echo " ooolanguagepack"
+ @echo " ooodevlanguagepack"
+ @echo " sdkoo"
+ @echo " sdkoodev"
+ @echo
+ @echo "Most targets (all except aoo_srcrelease and updatepack) accept
suffixes"
+ @echo " add _<language> to build a target for one language only"
+ @echo " the default set of languages is alllangiso=$(alllangiso)"
+ @echo " add .<package_format> to build a target for one package format
only"
+ @echo " the default set of package formats is archive and
PKGFORMAT=$(PKGFORMAT)"
+
+
LOCALPYFILES= \
$(BIN)$/uno.py \
$(BIN)$/unohelper.py \
commit 540585382cb686e467789919571530ec9820d99e
Author: Andre Fischer <a...@apache.org>
Date: Wed Oct 30 08:27:04 2013 +0000
123532: Remove last references to URE (already commented out).
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 9f18a6c..8538aba 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -28,8 +28,6 @@ TARGET=util
.INCLUDE: settings.mk
.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
-# PERL:=@echo
-
# watch for the path delimiter
.IF "$(GUI)"=="WNT"
PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
@@ -83,7 +81,6 @@ ALLTAR : $(LOCALPYFILES)
ALLTAR : openoffice
.ELSE
ALLTAR : openoffice sdkoo_en-US
-#ALLTAR : openoffice sdkoo_en-US ure_en-US
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -139,8 +136,6 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
-#ure: $(foreach,i,$(alllangiso) ure_$i)
-
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
@@ -177,8 +172,6 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-#$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
-
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
@@ -221,17 +214,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) :
$$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format
$(@:e:s/.//) $(VERBOSESWITCH)
-#$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
-#ure_%{$(PKGFORMAT:^".")} :
-#.IF "$(OS)" == "MACOSX"
-# @echo 'for now, there is no standalone URE for Mac OS X'
-#.ELSE
-# $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.#lst \
-# -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD)
-#format $(@:e:s/.//) $(VERBOSESWITCH) \
-# -msitemplate $(MSIURETEMPLATEDIR) \
-# -msilanguage $(MISC)$/win_ulffiles
-#.ENDIF
-
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
commit ba54ce4fc788605fc96235f432b455311faee406
Author: Armin Le Grand <a...@apache.org>
Date: Tue Oct 29 17:40:43 2013 +0000
i123564 corrected some aspects when working whith bitmaps with low color
depth or small size
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 1c86921..7243ca9 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -397,29 +397,40 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void
*, EMPTYARG )
Color aPixelColor = aFront;
Color aBackColor = aBack;
- aBitmapCtl.SetPixelColor( aPixelColor );
- aBitmapCtl.SetBackgroundColor( aBackColor );
+ // #123564# This causes the wrong color to be selected
+ // as foreground color when the 1st bitmap in the bitmap
+ // list is selected. I see no reason why this is done,
+ // thus I will take it out
+ //
+ //if( 0 == aLbBitmaps.GetSelectEntryPos() )
+ //{
+ // aLbColor.SelectEntry( Color( COL_BLACK ) );
+ // ChangePixelColorHdl_Impl( this );
+ //}
+ //else
+
+ aLbColor.SelectEntry( aPixelColor );
- // Wenn der Eintrag nicht in der Listbox ist, wird die Farbe
- // temporaer hinzugenommen
- if( 0 == aLbBitmaps.GetSelectEntryPos() )
- {
- aLbColor.SelectEntry( Color( COL_BLACK ) );
- ChangePixelColorHdl_Impl( this );
- }
- else
- aLbColor.SelectEntry( aPixelColor );
if( aLbColor.GetSelectEntryCount() == 0 )
{
aLbColor.InsertEntry( aPixelColor, String() );
aLbColor.SelectEntry( aPixelColor );
}
+
aLbBackgroundColor.SelectEntry( aBackColor );
+
if( aLbBackgroundColor.GetSelectEntryCount() == 0 )
{
aLbBackgroundColor.InsertEntry( aBackColor, String() );
aLbBackgroundColor.SelectEntry( aBackColor );
}
+
+ // update aBitmapCtl, rXFSet and aCtlPreview
+ aBitmapCtl.SetPixelColor( aPixelColor );
+ aBitmapCtl.SetBackgroundColor( aBackColor );
+ rXFSet.Put(XFillBitmapItem(String(),
Graphic(aBitmapCtl.GetBitmapEx())));
+ aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
+ aCtlPreview.Invalidate();
}
else
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 59ef189..b14fdc6 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -470,8 +470,9 @@ namespace drawinglayer
aGraphicRange.transform(mpOutputDevice->GetViewTransformation() *
aLocalTransform);
// extract discrete size of graphic
- const sal_Int32
nBWidth(basegfx::fround(aGraphicRange.getWidth()));
- const sal_Int32
nBHeight(basegfx::fround(aGraphicRange.getHeight()));
+ // caution: when getting to zero, nothing would be
painted; thus, do not allow this
+ const sal_Int32 nBWidth(std::max(sal_Int32(1),
basegfx::fround(aGraphicRange.getWidth())));
+ const sal_Int32 nBHeight(std::max(sal_Int32(1),
basegfx::fround(aGraphicRange.getHeight())));
// only do something when bitmap fill has a size
in discrete units
if(nBWidth > 0 && nBHeight > 0)
@@ -483,9 +484,17 @@ namespace drawinglayer
static bool bEnablePreScaling(true);
const bool bPreScaled(bEnablePreScaling &&
nBWidth * nBHeight < (250 * 250));
+ // ... but only up to a maximum size, else it
gets too expensive
if(bPreScaled)
{
- // ... but only up to a maximum size, else
it gets too expensive
+ // if color depth is below 24bit, expand
before scaling for better quality.
+ // This is even needed for low colors,
else the scale will produce
+ // a bitmap in gray or Black/White (!)
+ if(aBitmapEx.GetBitCount() < 24)
+ {
+
aBitmapEx.Convert(BMP_CONVERSION_24BIT);
+ }
+
aBitmapEx.Scale(aNeededBitmapSizePixel,
BMP_SCALE_INTERPOLATE);
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index aab55e8..5b300b8 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -130,8 +130,10 @@ bool SVX_DLLPUBLIC isHistorical8x8(const BitmapEx&
rBitmapEx, BitmapColor& o_rBa
{
const BitmapPalette& rPalette = pRead->GetPalette();
- o_rBack = rPalette[1];
- o_rFront = rPalette[0];
+ // #123564# bachground and foregrund were exchanged;
of course
+ // rPalette[0] is the background color
+ o_rFront = rPalette[1];
+ o_rBack = rPalette[0];
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
