[Libreoffice-commits] core.git: Branch 'aoo/trunk' - autodoc/inc autodoc/source cppuhelper/inc cppuhelper/prj cppuhelper/source odk/pack
autodoc/inc/autodoc/prs_code.hxx |4
autodoc/source/exes/adc_uni/adc_cl.cxx|5
autodoc/source/exes/adc_uni/adc_cmds.cxx |1
autodoc/source/exes/adc_uni/adc_cmds.hxx |1
autodoc/source/exes/adc_uni/cmd_run.cxx |3
autodoc/source/exes/adc_uni/spec-CommandLine.txt | 11
autodoc/source/inc/adc_cl.hxx | 10
autodoc/source/parser/cpp/prs_cpp.cxx | 21 +
autodoc/source/parser/inc/cpp/prs_cpp.hxx |4
cppuhelper/inc/cppuhelper/access_control.hxx |4
cppuhelper/inc/cppuhelper/bootstrap.hxx | 12
cppuhelper/inc/cppuhelper/compbase_ex.hxx | 10
cppuhelper/inc/cppuhelper/component.hxx |3
cppuhelper/inc/cppuhelper/component_context.hxx |2
cppuhelper/inc/cppuhelper/cppuhelperdllapi.h | 37 ++
cppuhelper/inc/cppuhelper/exc_hlp.hxx |6
cppuhelper/inc/cppuhelper/factory.hxx |9
cppuhelper/inc/cppuhelper/implbase.hxx|8
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 15 -
cppuhelper/inc/cppuhelper/implementationentry.hxx |5
cppuhelper/inc/cppuhelper/interfacecontainer.h|8
cppuhelper/inc/cppuhelper/propertysetmixin.hxx|3
cppuhelper/inc/cppuhelper/propshlp.hxx|9
cppuhelper/inc/cppuhelper/servicefactory.hxx |2
cppuhelper/inc/cppuhelper/shlib.hxx |3
cppuhelper/inc/cppuhelper/stdidlclass.hxx |2
cppuhelper/inc/cppuhelper/typeprovider.hxx|5
cppuhelper/inc/cppuhelper/unourl.hxx |6
cppuhelper/inc/cppuhelper/weak.hxx|3
cppuhelper/inc/cppuhelper/weakagg.hxx |3
cppuhelper/inc/cppuhelper/weakref.hxx |4
cppuhelper/prj/d.lst |1
cppuhelper/source/bootstrap.cxx |1
cppuhelper/source/makefile.mk |7
cppuhelper/source/msvc_win32_intel.map| 306 --
odk/pack/gendocu/makefile.mk |4
36 files changed, 186 insertions(+), 352 deletions(-)
New commits:
commit 88cafd9018f405f31e287279ec043e3994a25b51
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sat Mar 10 09:06:22 2018 +
tr;dr: Don't use .map files for main/cppuhelper on Windows, control
symbol visibility using source-level declarations instead.
C++ symbols are mangled differently on Win64 and Win32, and extracting
new symbols from binaries and updating .DEF/.map files that control symbol
visibility is painful. Both Windows and *nix have moved from using .DEF
and .map files to using declarations in the source code instead, of the
form __declspec(dllexport) and __attribute__ ((visibility("default")))
(which we wrap in SAL_DLLPUBLIC_EXPORT).
The GBuild ported modules also have to replace .map files with source code
declarations (and all so far have), as the default symbol visibility in
GBuild is "hidden" and GBuild has no mechanism to use .map files so far.
So for the purpose of the Win64 port, but as a generally good idea and a
necessity for future GBuild ports, re-implement linker symbol visibility
in main/cppuhelper using SAL_DLLPUBLIC_EXPORT declarations in the source
code instead of using .map files. The purpose of .map files is to version
symbols in the ELF binary format on *nix instead of just controlling
visibility, so they still provide that benefit on *nix, but Windows has no
symbol versioning, all dmake does with .map files is convert them to
unversioned .DEF files, which are harder to maintain than source-level
declarations (as they are both mangled and in a separate file, and have
to be specified per method instead of only once per class).
This turned out to cause trouble, as our autodoc tool doesn't have a C
preprocessor, so the "CPPUHELPER_DLLPUBLIC" was breaking generating
documentation, which was breaking the build due to documentation
completeness checks in main/odk. Thus main/autodoc had to be patched to
allow command line parameters passed to it to specify parsing tokens to
ignore, and main/odk had to be patched to pass "CPPUHELPER_DLLPUBLIC" as
the token to ignore.
Patch by: me
diff --git a/autodoc/inc/autodoc/prs_code.hxx b/autodoc/inc/autodoc/prs_code.hxx
index cf5b5e392d1c..18e476871db7 100644
--- a/autodoc/inc/autodoc/prs_code.hxx
+++ b/autodoc/inc/autodoc/prs_code.hxx
@@ -58,7 +58,9 @@ class CodeParser_Ifc
virtual voidSetup(
ary::Repository & o_rRepository,
const autodoc::DocumentationParser_Ifc &
-i_rDocumentationInterpreter )
= 0;
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/settings officecfg/registry solenv/win64
odk/settings/settings.mk |8 -- officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu |2 solenv/win64/win64.patch | 28 ++ 3 files changed, 29 insertions(+), 9 deletions(-) New commits: commit ddd858ea859bab6078d1add02ecb57578385f3b7 Author: Damjan Jovanovic <dam...@apache.org> Date: Tue Mar 6 16:59:52 2018 + Revert 1825956 and put it into the win64.patch file instead, as it may break building 32 bit AOO on 64 bit Windows. Patch by: me diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index f22d2d1eedb2..0976ec27b988 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -57,8 +57,6 @@ JAVABIN=bin ifeq "$(PLATFORM)" "windows" # Settings for Windows using Microsoft compiler/linker -PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 's/^i.86$$/i386/') - OS=WIN PS=\\ ICL=$$ @@ -121,14 +119,8 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu # define for used compiler necessary for UNO # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x -ifeq "$(PROCTYPE)" "i386" CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci -endif -ifeq "$(PROCTYPE)" "x86_64" -CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx -CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx -endif CC_OUTPUT_SWITCH=-Fo LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv diff --git a/solenv/win64/win64.patch b/solenv/win64/win64.patch index ff17fc5e4865..17f96f0cee1b 100644 --- a/solenv/win64/win64.patch +++ b/solenv/win64/win64.patch @@ -252,3 +252,31 @@ Index: solenv/inc/wnt.mk # --- changes for W32-tcsh - should move into settings.mk --- JAVAC=javac JAVA=java +Index: main/odk/settings/settings.mk +=== +--- main/odk/settings/settings.mk (revision 1825955) main/odk/settings/settings.mk (revision 1825956) +@@ -57,6 +57,8 @@ + ifeq "$(PLATFORM)" "windows" + # Settings for Windows using Microsoft compiler/linker + ++PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 's/^i.86$$/i386/') ++ + OS=WIN + PS=\\ + ICL=$$ +@@ -119,8 +121,14 @@ + # define for used compiler necessary for UNO + # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x + ++ifeq "$(PROCTYPE)" "i386" + CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci + CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci ++endif ++ifeq "$(PROCTYPE)" "x86_64" ++CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx ++CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx ++endif + CC_OUTPUT_SWITCH=-Fo + + LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv commit 9e642822f4394464c52af6f2268511154f5bc744 Author: Matthias Seidel <msei...@apache.org> Date: Tue Mar 6 15:21:07 2018 + Changed links to https to avoid redirection diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu index 39a7c7077a61..fbc98bc46f3a 100644 --- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu @@ -26,7 +26,7 @@ http://openoffice.org/2001/registry;> - http://extensions.openoffice.org/getmore?cid=920794 + https://extensions.openoffice.org/getmore?cid=920794 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - jurt/Ant_jurt.mk jurt/com jurt/java jurt/Library_jpipe.mk jurt/Library_wrapper.mk jurt/Makefile jurt/Module_jurt.mk jurt/prj jurt/test
Module_ooo.mk |1 Repository.mk |2 jurt/Ant_jurt.mk | 27 + jurt/Library_jpipe.mk | 38 ++ jurt/Library_wrapper.mk | 38 ++ jurt/Makefile | 32 + jurt/Module_jurt.mk | 52 ++ jurt/Zip_jurt-src.mk | 83 jurt/java/jurt/build.xml | 46 ++ jurt/java/jurt/src/main/java/com/sun/star/comp/loader/FactoryHelper.java | 26 - jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java |4 jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/ServiceManager.java | 24 - jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/UrlResolver.java |2 jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/PipeConnection.java |4 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JobQueue.java |4 jurt/prj/build.lst | 22 - jurt/prj/d.lst |8 jurt/prj/makefile.mk | 44 ++ odk/pack/gendocu/makefile.mk |2 solenv/ant/aoo-ant.xml | 184 ++ solenv/ant/externals.xml | 76 solenv/ant/idl.xml | 99 + solenv/gbuild/Ant.mk | 87 solenv/gbuild/TargetLocations.mk |2 solenv/gbuild/gbuild.mk |1 25 files changed, 847 insertions(+), 61 deletions(-) New commits: commit cfb4b128bbc9ffb4128605301f0a57728a5a6d87 Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Apr 8 13:25:06 2018 + Pass the Windows path to Ant on Windows, as /cygdrive/c/... doesn't work. Skip tests when JUnit is absent correctly: the OOO_JUNIT_JAR variable isn't blank but absent. This should fix building on Windows. Patch by: me diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml index 7e9b79e7b38f..94f4fa9442cd 100644 --- a/solenv/ant/aoo-ant.xml +++ b/solenv/ant/aoo-ant.xml @@ -119,10 +119,10 @@ - - + + - + + if:set="OOO_JUNIT_JAR"/> - + diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk index 72b7e900f226..2cd1bc18609b 100644 --- a/solenv/gbuild/Ant.mk +++ b/solenv/gbuild/Ant.mk @@ -50,8 +50,13 @@ FORCE: # adds jar files to DeliverLogTarget # adds dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) define gb_Ant_Ant +ifeq ($(OS),WNT) +$(call gb_Ant_get_target,$(1)) : ANTBUILDFILE := `cygpath -m $(2)` +$(call gb_Ant_get_clean_target,$(1)) : ANTBUILDFILE := `cygpath -m $(2)` +else $(call gb_Ant_get_target,$(1)) : ANTBUILDFILE := $(2) $(call gb_Ant_get_clean_target,$(1)) : ANTBUILDFILE := $(2) +endif $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_clean_target,$(1 $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_target,$(1)),$(1)) $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1)) commit 5dbdf373724ffda567a8935fe2cb28d2159112ea Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Apr 8 12:55:40 2018 + Add a file accidentally left out of the last commit. Patch by: me diff --git a/jurt/prj/makefile.mk b/jurt/prj/makefile.mk new file mode 100644 index ..c62c6a657d16 --- /dev/null +++ b/jurt/prj/makefile.mk @@ -0,0 +1,44 @@ +#** +# +# 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 +#
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/java
jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk | 43 jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk | 37 --- jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk | 38 --- jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk | 40 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk | 40 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk | 46 - jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk | 33 -- jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk | 40 jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk | 38 --- jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk | 48 -- jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk | 47 - 15 files changed, 606 deletions(-) New commits: commit 263c6b0f859e1b8cc6bfcbaaeddfb17601992747 Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Apr 8 15:49:22 2018 + We don't need dmake makefiles in main/jurt any more. Patch by: me diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk deleted file mode 100644 index a16a581fe942.. --- a/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -#** -# -# 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 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#** - - - -PRJ= ..$/..$/..$/..$/.. -PRJNAME = jurt -PACKAGE = com$/sun$/star$/comp$/bridgefactory -TARGET = com_sun_star_comp_bridgefactory - -# --- Settings - - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files - -JAVAFILES = BridgeFactory.java - -# --- Targets -- - -.INCLUDE : target.mk diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk deleted file mode 100644 index 5b56bdb3f486.. --- a/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -#** -# -# 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 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#** - - - -PRJ = ..$/..$/..$/..$/.. -PRJNAME = jurt -TARGET = com_sun_star_comp_connections - -PACKAGE = com$/sun$/star$/comp$/connections - -.IN
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/ant
solenv/ant/aoo-ant.xml | 29 - 1 file changed, 24 insertions(+), 5 deletions(-) New commits: commit d29f38a34d65a4a5876e54ad974862997a3e77c3 Author: Damjan Jovanovic <dam...@apache.org> Date: Tue Apr 10 16:01:01 2018 + Check whether JUnit tests are present before trying to compile them. Patch by: me diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml index 6eda8af41072..3a267edcbebb 100644 --- a/solenv/ant/aoo-ant.xml +++ b/solenv/ant/aoo-ant.xml @@ -118,11 +118,30 @@ includeantruntime="false"/> - - - + + + + + + + + + + + + + + + + + + + + + - + + + unless:set="test.skip"/>
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk odk/pack ridljar/Ant_ridl.mk ridljar/Ant_unoloader.mk ridljar/com ridljar/java ridljar/Makefile ridljar/Module_ridljar.mk ridljar/prj
Module_ooo.mk |1 odk/pack/gendocu/makefile.mk|2 ridljar/Ant_ridl.mk | 12 -- ridljar/Ant_unoloader.mk| 27 + ridljar/Makefile| 32 + ridljar/Module_ridljar.mk | 33 ++ ridljar/Zip_ridl_src.mk | 54 ++ ridljar/Zip_unoloader_src.mk| 31 + ridljar/java/ridl/build.xml | 53 + ridljar/java/ridl/src/main/java/com/sun/star/uno/IFieldDescription.java |2 ridljar/java/ridl/src/main/java/com/sun/star/uno/ITypeDescription.java |4 ridljar/java/unoloader/build.xml| 34 ++ ridljar/prj/build.lst |6 - ridljar/prj/d.lst |4 ridljar/prj/makefile.mk | 46 +++- solenv/ant/aoo-ant.xml |8 - solenv/ant/idl.xml | 35 -- 17 files changed, 323 insertions(+), 61 deletions(-) New commits: commit a1f7ca4f8b8e34eacd4ae5736ffec9104c8feb47 Author: Damjan Jovanovic <dam...@apache.org> Date: Mon Apr 9 17:07:08 2018 + Port main/ridljar to gbuild / Ant. Generalize the Ant build a bit, to make using javamaker more flexible, and allow arbitrary "pre-compile" actions to be plugged in. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index ad9bdbb29561..67cea532ba17 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ registry \ remotebridges \ reportdesign \ +ridljar \ sane \ sax \ sc \ diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index ba8ff2c8cf0e..fe6ee9741c16 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -99,7 +99,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG) -rm $(@:d:d)$/cpp.css $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css -$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/jurt_src.zip $(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/unoloader_src.zip $(SOLARCOMMONPCKDIR)$/juh_src.zip +$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/jurt_src.zip $(SOLARCOMMONPCKDIR)$/ridl_src.zip $(SOLARCOMMONPCKDIR)$/unoloader_src.zip $(SOLARCOMMONPCKDIR)$/juh_src.zip -$(MKDIRHIER) $(@:d) $(MY_COPY) $^ $(JAVA_SRC_DIR) cd $(JAVA_SRC_DIR) && unzip -qu jurt_src.zip && unzip -qu ridl_src.zip && unzip -qu unoloader_src.zip && unzip -qu juh_src.zip diff --git a/ridljar/source/unoloader/makefile.mk b/ridljar/Ant_ridl.mk similarity index 83% rename from ridljar/source/unoloader/makefile.mk rename to ridljar/Ant_ridl.mk index 42b1c1e67021..5c0a918bd9a8 100644 --- a/ridljar/source/unoloader/makefile.mk +++ b/ridljar/Ant_ridl.mk @@ -21,15 +21,7 @@ -PRJ := ..$/.. -PRJNAME := ridljar +$(eval $(call gb_Ant_Ant,ridl,$(SRCDIR)/ridljar/java/ridl/build.xml)) -TARGET := unoloader +# vim: set noet sw=4 ts=4: -.INCLUDE: settings.mk - -ZIP1TARGET = $(TARGET)_src -ZIP1FLAGS = -r -ZIP1LIST = com -x '*makefile.mk' -x '*manifest' - -.INCLUDE: target.mk diff --git a/ridljar/Ant_unoloader.mk b/ridljar/Ant_unoloader.mk new file mode 100644 index ..26f630d79e97 --- /dev/null +++ b/ridljar/Ant_unoloader.mk @@ -0,0 +1,27 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Ant_Ant,unoloader,$(SRCDIR)/ridljar/java/unoloader/build.xml)) + +
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - jvmfwk/plugins solenv/ant
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 87 +++--
solenv/ant/aoo-ant.xml |5 +
2 files changed, 50 insertions(+), 42 deletions(-)
New commits:
commit c81bc5523f31cad14262bfd4fea26af1acfea804
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Apr 15 09:47:52 2018 +
Target our baseline Java version in the new Ant build.
Patch by: me
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 3a267edcbebb..d8b91b2d7dec 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -40,6 +40,7 @@
+
@@ -111,6 +112,8 @@
Date: Sun Apr 15 09:46:56 2018 +
Improve Java detection on *nix, by also checking the immediate
subdirectories of /usr and /usr/local, where at least FreeBSD puts Java
(eg. /usr/local/openjdk8, /usr/local/openjdk7-jre). Also simplify that
search code a bit, and eliminate an unnecessary stat() for a directory on
which it has already been called earlier.
Patch by: me
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index e8f048df8c27..90c52f3ab66d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -91,25 +91,30 @@ char const *g_arCollectDirs[] = {
"jvm/"
};
+struct JavaSearchPathEntry {
+int searchImmediateContents; // More thorough, too slow for /usr/bin and
/usr/lib
+char const *path;
+};
+
/* These are directories in which a java installation is
looked for.
*/
-char const *g_arSearchPaths[] = {
+struct JavaSearchPathEntry g_arSearchPaths[] = {
#ifdef MACOSX
-"",
-"Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
-"System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
+{ 0, "" },
+{ 0, "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin"
},
+{ 0, "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/" },
#else
-"",
-"usr/",
-"usr/local/",
-"usr/local/IBMJava2-ppc-142",
-"usr/local/j2sdk1.3.1",
+{ 0, "" },
+{ 1, "usr/" },
+{ 1, "usr/local/" },
+{ 0, "usr/local/IBMJava2-ppc-142" },
+{ 0, "usr/local/j2sdk1.3.1" },
#ifdef X86_64
-"usr/lib64/",
+{ 0, "usr/lib64/" },
#endif
-"usr/lib/",
-"usr/bin/"
+{ 0, "usr/lib/" },
+{ 0, "usr/bin/" }
#endif
};
}
@@ -1148,11 +1153,11 @@ void
createJavaInfoDirScan(vector<rtl::Reference >& vecInfos)
arNames[i] = OUString(g_arJavaNames[i], strlen(g_arJavaNames[i]),
RTL_TEXTENCODING_UTF8);
-int cSearchPaths= sizeof(g_arSearchPaths) / sizeof(char*);
+int cSearchPaths= sizeof(g_arSearchPaths) / sizeof(g_arSearchPaths[0]);
boost::scoped_array sarPathNames(new OUString[cSearchPaths]);
OUString *arPaths = sarPathNames.get();
for(int c = 0; c < cSearchPaths; c++)
-arPaths[c] = OUString(g_arSearchPaths[c], strlen(g_arSearchPaths[c]),
+arPaths[c] = OUString(g_arSearchPaths[c].path,
strlen(g_arSearchPaths[c].path),
RTL_TEXTENCODING_UTF8);
int cCollectDirs = sizeof(g_arCollectDirs) / sizeof(char*);
@@ -1174,8 +1179,8 @@ void
createJavaInfoDirScan(vector<rtl::Reference >& vecInfos)
for(int j= 0; j < cCollectDirs; j++)
{
OUString usDir2(usDir1 + arCollectDirs[j]);
-// prevent that we scan the whole /usr, /usr/lib, etc
directories
-if (arCollectDirs[j] != OUString())
+// prevent that we scan the whole /usr/bin, /usr/lib, etc
directories
+if (g_arSearchPaths[ii].searchImmediateContents ||
arCollectDirs[j] != OUString())
{
//usr/java/xxx
//Examin every subdirectory
@@ -1227,33 +1232,31 @@ void
createJavaInfoDirScan(vector<rtl::Reference >& vecInfos)
+ usDir2 + OUSTR(". Osl file error: ")
+ OUString::valueOf((sal_Int32) openErr));
}
-else
+}
+for (int j= 0; j < cJavaNames; j++)
+{
+//When we look directly into a dir like /usr/bin, /usr/lib,
etc. then we only
+//look for certain java directories, such as jre, jdk, etc.
Whe do not want
+//to examine the whole directory because of performance
reasons.
+
+// usFile arNames[j]
+// <--><->
+// file:///usr/lib/jvm
+//
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/Ant_jreproperties.mk jvmfwk/distributions jvmfwk/Executable_javaldx.mk jvmfwk/inc jvmfwk/java jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjav
Repository.mk |2 RepositoryFixes.mk |4 jvmfwk/Ant_jreproperties.mk | 27 jvmfwk/Executable_javaldx.mk| 41 +++ jvmfwk/Library_jvmfwk.mk| 72 jvmfwk/Library_sunjavaplugin.mk | 74 + jvmfwk/Makefile | 32 + jvmfwk/Module_jvmfwk.mk | 58 +++--- jvmfwk/Package_inc.mk | 28 jvmfwk/Package_javasettingsunopkginstall.mk | 26 jvmfwk/Package_javavendors.mk | 49 jvmfwk/Package_jvmfwk3rc.mk | 33 + jvmfwk/Package_sunjavapluginrc.mk | 31 + jvmfwk/inc/jvmfwk/framework.h | 43 +++ jvmfwk/inc/jvmfwk/jvmfwkdllapi.h| 37 ++ jvmfwk/inc/jvmfwk/vendorplugin.h|9 - jvmfwk/inc/pch/precompiled_plugin.cxx | 25 jvmfwk/inc/pch/precompiled_plugin.hxx | 28 jvmfwk/java/jreproperties/build.xml | 45 +++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx|2 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx|2 jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 113 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |2 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx|2 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx|2 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx|2 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx|2 jvmfwk/prj/build.lst|6 - jvmfwk/prj/d.lst| 23 jvmfwk/prj/makefile.mk | 41 +++ jvmfwk/source/makefile.mk | 86 --- solenv/ant/aoo-ant.xml |4 solenv/gbuild/platform/freebsd.mk |7 - solenv/gbuild/platform/linux.mk |5 solenv/gbuild/platform/macosx.mk|7 - solenv/gbuild/platform/windows.mk |5 solenv/gbuild/platform/winmingw.mk |4 38 files changed, 622 insertions(+), 359 deletions(-) New commits: commit 5c83d202807d82e3cf5b2962e81ac51501f73221 Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Apr 15 13:33:19 2018 + Port main/jvmfwk to gbuild / Ant. Fix the gbuild platform CPUDEFS to conform to what modules expect. Patch by: me diff --git a/Repository.mk b/Repository.mk index ce8467fe768d..066bd2f1b6ff 100644 --- a/Repository.mk +++ b/Repository.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Helper_register_executables,SDK, \ )) $(eval $(call gb_Helper_register_executables,UREBIN, \ +javaldx \ regmerge \ regview \ )) @@ -179,6 +180,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ jpipe \ jpipx \ +sunjavaplugin \ xmlreader \ )) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index cc32c9bababc..dd85ed5334df 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -38,6 +38,7 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES)) gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) @@ -55,6 +56,7 @@ gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILE gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES)) #$(info libnames: $(gb_Library_FILENAMES)) endif @@ -70,6 +72,7 @@ gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILE gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(pa
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5d4ce3e29c7aab3498e0955485d8707a8f5fb456
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Apr 15 15:00:46 2018 +
Allow the Java version suffix (eg. the 162 in 1.8.0_162) to be
3 digits long.
Patch by: me
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index a9c98ddae024..c1872f0d61f4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -144,8 +144,9 @@ bool SunVersion::init(const char *szVersion)
if ( ! isdigit(*pCur))
{
//1.4.1_01-, 1.4.1_01a, the numerical part may only be 2
chars.
+//1.7.0_161, 1.8.0_162, it's as long as 3 chars in later
Java version.
int len = pCur - pLast;
-if (len > 2)
+if (len > 3)
return false;
//we've got the update: 01, 02 etc
strncpy(buf, pLast, len);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Repository.mk unodevtools/Executable_uno-skeletonmaker.mk unodevtools/Makefile unodevtools/Module_unodevtools.mk unodevtools/prj unodevtools/source
Repository.mk |4 + unodevtools/Executable_uno-skeletonmaker.mk | 63 unodevtools/Makefile| 32 ++ unodevtools/Module_unodevtools.mk | 32 ++ unodevtools/prj/build.lst |6 -- unodevtools/prj/d.lst |5 -- unodevtools/prj/makefile.mk | 38 +++- unodevtools/unodevtools.pmk | 61 --- 8 files changed, 122 insertions(+), 119 deletions(-) New commits: commit 6176f177905984d9a2de23714d700b19a427c175 Author: Damjan Jovanovic <dam...@apache.org> Date: Tue Mar 27 00:31:06 2018 + Port main/unodevtools to gbuild. Patch by: me diff --git a/Repository.mk b/Repository.mk index 7c9f570f506c..a8b20661bc26 100644 --- a/Repository.mk +++ b/Repository.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_executables,SDK, \ regcompare \ +uno-skeletonmaker \ )) $(eval $(call gb_Helper_register_executables,UREBIN, \ @@ -249,6 +250,9 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ basegfx_s \ +codemaker \ +commoncpp \ +commonjava \ ooopathutils \ salcpprt \ sldshw_s \ diff --git a/unodevtools/Executable_uno-skeletonmaker.mk b/unodevtools/Executable_uno-skeletonmaker.mk new file mode 100644 index ..298cca3f3a25 --- /dev/null +++ b/unodevtools/Executable_uno-skeletonmaker.mk @@ -0,0 +1,63 @@ +### +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +### + + + +$(eval $(call gb_Executable_Executable,uno-skeletonmaker)) + +$(eval $(call gb_Executable_add_api,uno-skeletonmaker,\ + udkapi \ +)) + +$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\ + -I$(SRCDIR)/unodevtools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_add_linked_libs,uno-skeletonmaker,\ + cppu \ + cppuhelper \ + reg \ + sal \ + salhelper \ + stl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_linked_static_libs,uno-skeletonmaker,\ + codemaker \ + commoncpp \ + commonjava \ +)) + +$(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\ + unodevtools/source/unodevtools/options \ + unodevtools/source/unodevtools/typeblob \ + unodevtools/source/unodevtools/typemanager \ + unodevtools/source/skeletonmaker/cppcompskeleton \ + unodevtools/source/skeletonmaker/cpptypemaker \ + unodevtools/source/skeletonmaker/javacompskeleton \ + unodevtools/source/skeletonmaker/javatypemaker \ + unodevtools/source/skeletonmaker/skeletoncommon \ + unodevtools/source/skeletonmaker/skeletonmaker \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/unodevtools/Makefile b/unodevtools/Makefile new file mode 100644 index ..c1d144cbd4c9 --- /dev/null +++ b/unodevtools/Makefile @@ -0,0 +1,32 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +ifeq (
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cosv/Makefile cosv/Module_cosv.mk cosv/Package_inc.mk cosv/prj cosv/source cosv/StaticLibrary_cosv.mk cosv/util Repository.mk vos/inc vos/Library_v
Repository.mk |1 cosv/Makefile | 32 cosv/Module_cosv.mk| 35 - cosv/Package_inc.mk| 54 cosv/StaticLibrary_cosv.mk | 63 + cosv/prj/build.lst | 13 - cosv/prj/d.lst |8 - cosv/prj/makefile.mk | 49 +++ cosv/util/makefile.mk | 54 vos/Library_vos3.mk| 90 +++-- vos/Makefile | 32 vos/Module_vos.mk | 16 -- vos/Package_inc.mk | 51 +++ vos/inc/vos/conditn.hxx|3 vos/inc/vos/module.hxx |3 vos/inc/vos/mutex.hxx |3 vos/inc/vos/object.hxx |5 vos/inc/vos/pipe.hxx |4 vos/inc/vos/process.hxx| 11 - vos/inc/vos/refernce.hxx |5 vos/inc/vos/security.hxx |3 vos/inc/vos/signal.hxx |3 vos/inc/vos/socket.hxx | 17 +- vos/inc/vos/stream.hxx |3 vos/inc/vos/thread.hxx |5 vos/inc/vos/timer.hxx |3 vos/inc/vos/vosdllapi.h| 37 + vos/inc/vos/xception.hxx |3 vos/prj/build.lst |6 vos/prj/d.lst | 16 -- vos/prj/makefile.mk| 52 +++ vos/source/makefile.mk | 75 --- vos/util/libvos1C50.so.mapfile | 274 - vos/util/makefile.mk | 81 34 files changed, 417 insertions(+), 693 deletions(-) New commits: commit b23233bb170ac583fcf00718dd6860827fdff9ab Author: Damjan Jovanovic <dam...@apache.org> Date: Wed Mar 28 05:28:31 2018 + Port main/cosv and mac/vos to gbuild. Patch by: me diff --git a/Repository.mk b/Repository.mk index a8b20661bc26..04fd1b9f8043 100644 --- a/Repository.mk +++ b/Repository.mk @@ -253,6 +253,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ codemaker \ commoncpp \ commonjava \ +cosv \ ooopathutils \ salcpprt \ sldshw_s \ diff --git a/cosv/Makefile b/cosv/Makefile new file mode 100644 index ..c1d144cbd4c9 --- /dev/null +++ b/cosv/Makefile @@ -0,0 +1,32 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/cosv/source/service/makefile.mk b/cosv/Module_cosv.mk similarity index 64% rename from cosv/source/service/makefile.mk rename to cosv/Module_cosv.mk index d4b1d46e68a2..0ad3e45cc0a2 100644 --- a/cosv/source/service/makefile.mk +++ b/cosv/Module_cosv.mk @@ -21,35 +21,12 @@ -PRJ=..$/.. - -PRJNAME=cosv -TARGET=cosv_service - -ENABLE_EXCEPTIONS=true - - -# --- Settings - - -.INCLUDE : settings.mk - -.INCLUDE : $(PRJ)$/source$/fullcpp.mk - - - -# --- Files - -OBJFILES= \ -$(OBJ)$/comdline.obj \ -$(OBJ)$/comfunc.obj\ -$(OBJ)$/csv_ostream.obj \ -$(OBJ)$/datetime.obj \ -$(OBJ)$/std_outp.obj - - -# --- Targets -- - -.INCLUDE : target.mk +$(eval $(call gb_Module_Module,cosv)) +$(eval $(call gb_Module_add_targets,cosv,\ + StaticLibrary_cosv \ + Package_inc \ +)) +# vim: set noet sw=4 ts=4: diff --git a/cosv/Package_inc.mk b/cosv/Package_inc.mk new file mode 100644 index ..4c9f9dabb54d --- /dev/null +++ b/cosv/Package_inc.mk @@ -0,0 +1,54 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional informati
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmaccess/inc jvmaccess/util
jvmaccess/inc/jvmaccess/unovirtualmachine.hxx | 18 +-
jvmaccess/inc/jvmaccess/virtualmachine.hxx| 20 ++--
jvmaccess/util/gcc3.map |8
jvmaccess/util/mingw.map |8
4 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 2e2e14976eec69b80c04bdf4f5e8d393e04b78dc
Author: Damjan Jovanovic <dam...@apache.org>
Date: Mon Mar 26 04:48:54 2018 +
On Windows the main/jvmaccess module refuses to be linked to by main/stoc
due to not exporting typeinfos, or refuses to compile because it needs
array constructors from salhelper's simplereferenceobject.
It seems we have to hide all typeinfos, and export methods on a
case-by-case basis, just like the .map files do. This gets it to compile,
and seems to get main/stoc to link to it successfully.
Patch by: me
diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
index 73ada3b86c81..1e85c131fd30 100644
--- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
@@ -36,20 +36,20 @@ class VirtualMachine;
/** An encapsulating wrapper around a Java virtual machine and an appropriate
UNO class loader.
*/
-class JVMACCESS_DLLPUBLIC UnoVirtualMachine: public
salhelper::SimpleReferenceObject {
+class UnoVirtualMachine: public salhelper::SimpleReferenceObject {
public:
/** An exception indicating failure to create a UnoVirtualMachine.
*/
-class JVMACCESS_DLLPUBLIC CreationException
+class CreationException
{
public:
-CreationException();
+JVMACCESS_DLLPUBLIC CreationException();
-CreationException(CreationException const &);
+JVMACCESS_DLLPUBLIC CreationException(CreationException const &);
-virtual ~CreationException();
+JVMACCESS_DLLPUBLIC virtual ~CreationException();
-CreationException & operator =(CreationException const &);
+JVMACCESS_DLLPUBLIC CreationException & operator =(CreationException
const &);
};
/** Create a wrapper around a Java virtual machine and an appropriate UNO
@@ -69,7 +69,7 @@ public:
@exception CreationException
Thrown in case creation fails (due to a JNI problem).
*/
-UnoVirtualMachine(
+JVMACCESS_DLLPUBLIC UnoVirtualMachine(
rtl::Reference< jvmaccess::VirtualMachine > const & virtualMachine,
void * classLoader);
@@ -78,7 +78,7 @@ public:
@return
The Java virtual machine wrapper. Will never be null.
*/
-rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const;
+JVMACCESS_DLLPUBLIC rtl::Reference< jvmaccess::VirtualMachine >
getVirtualMachine() const;
/** Get the UNO class loader.
@@ -89,7 +89,7 @@ public:
different for different JDK versions, so that the mangled C++ name of
the function would depend on the JDK version used at compile time.
*/
-void * getClassLoader() const;
+JVMACCESS_DLLPUBLIC void * getClassLoader() const;
private:
UnoVirtualMachine(UnoVirtualMachine &); // not defined
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index 79205b1d3524..8ea6136bf342 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -41,7 +41,7 @@ namespace jvmaccess {
/** An encapsulating wrapper around a Java virtual machine.
*/
-class JVMACCESS_DLLPUBLIC VirtualMachine: public
salhelper::SimpleReferenceObject
+class VirtualMachine: public salhelper::SimpleReferenceObject
{
public:
/** A helper to attach a thread to a Java virtual machine.
@@ -54,21 +54,21 @@ public:
detach the thread from the virtual machine upon destruction of the
guard
at the bottom of the stack).
*/
-class JVMACCESS_DLLPUBLIC AttachGuard
+class AttachGuard
{
public:
/** An exception indicating failure to create an AttachGuard.
*/
-class JVMACCESS_DLLPUBLIC CreationException
+class CreationException
{
public:
-CreationException();
+JVMACCESS_DLLPUBLIC CreationException();
-CreationException(CreationException const &);
+JVMACCESS_DLLPUBLIC CreationException(CreationException const &);
-virtual ~CreationException();
+JVMACCESS_DLLPUBLIC virtual ~CreationException();
-CreationException & operator =(CreationException const &);
+JVMACCESS_DLLPUBLIC CreationException & operator
=(CreationException const &);
};
/** Attach the current thread to a virtual machine.
@@ -79,11 +79,11 @@ public:
@exception CreationException
Throw
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/inc lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen_uno.mk lingucomponent/Library_lnth.mk lingucomponent/Library_M
Module_ooo.mk |1 Repository.mk |6 RepositoryExternal.mk | 105 + RepositoryFixes.mk | 17 + lingucomponent/Library_MacOSXSpell.mk | 67 ++ lingucomponent/Library_guesslang.mk| 66 ++ lingucomponent/Library_hyphen_uno.mk | 71 ++ lingucomponent/Library_lnth.mk | 71 ++ lingucomponent/Library_spell.mk| 71 ++ lingucomponent/Makefile| 32 ++ lingucomponent/Module_lingucomponent.mk| 51 lingucomponent/Package_config.mk | 28 ++ lingucomponent/StaticLibrary_ulingu.mk | 51 lingucomponent/inc/pch/precompiled_guesslang.cxx | 25 ++ lingucomponent/inc/pch/precompiled_guesslang.hxx | 29 ++ lingucomponent/inc/pch/precompiled_hyphen.cxx | 25 ++ lingucomponent/inc/pch/precompiled_hyphen.hxx | 29 ++ lingucomponent/inc/pch/precompiled_lnth.cxx| 25 ++ lingucomponent/inc/pch/precompiled_lnth.hxx| 29 ++ lingucomponent/inc/pch/precompiled_mac.cxx | 25 ++ lingucomponent/inc/pch/precompiled_mac.hxx | 29 ++ lingucomponent/inc/pch/precompiled_spell.cxx | 25 ++ lingucomponent/inc/pch/precompiled_spell.hxx | 29 ++ lingucomponent/prj/build.lst | 10 lingucomponent/prj/d.lst | 53 lingucomponent/prj/makefile.mk | 40 +-- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp |2 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx |6 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |2 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 105 - lingucomponent/source/languageguessing/altstrfunc.cxx |2 lingucomponent/source/languageguessing/guess.cxx |2 lingucomponent/source/languageguessing/guesslang.cxx |6 lingucomponent/source/languageguessing/makefile.mk | 88 lingucomponent/source/languageguessing/simpleguesser.cxx |2 lingucomponent/source/spellcheck/macosxspell/macreg.cxx|6 lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx |2 lingucomponent/source/spellcheck/macosxspell/makefile.mk | 92 lingucomponent/source/spellcheck/spell/exports.dxp |2 lingucomponent/source/spellcheck/spell/makefile.mk | 107 -- lingucomponent/source/spellcheck/spell/sreg.cxx|6 lingucomponent/source/spellcheck/spell/sspellimp.cxx |2 lingucomponent/source/thesaurus/libnth/exports.dxp |2 lingucomponent/source/thesaurus/libnth/makefile.mk | 107 -- lingucomponent/source/thesaurus/libnth/nthesdta.cxx|2 lingucomponent/source/thesaurus/libnth/nthesimp.cxx|2 lingucomponent/source/thesaurus/libnth/ntreg.cxx |6 postprocess/packcomponents/makefile.mk | 12 - solenv/gbuild/LinkTarget.mk|4 49 files changed, 954 insertions(+), 623 deletions(-) New commits: commit e0f59ea0d587ac0cfc3081732a6a4ab030e7a457 Author: Damjan Jovanovic <dam...@apache.org> Date: Fri Mar 30 19:16:11 2018 + Port main/lingucomponent to gbuild. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index ea4d80539b67..bec3c6d60e4e 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ io \ javaunohelper \ jvmaccess \ +lingucomponent \ linguistic \ o3tl \ offapi \ diff --git a/Repository.mk b/Repository.mk index 02745716c7b7..1aadac0059c6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Helper_register_executables,UREBIN, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ AppleRemote \ +MacOSXSpell \ adabas \ adabasui \ agg \ @@ -102,6 +103,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwk \ fwl \ fwm \ +guesslang \ i18npaper \ juh \ juhx \ @@ -220,10 +222,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLI
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - autodoc/Executable_autodoc.mk autodoc/Makefile autodoc/Module_autodoc.mk autodoc/prj autodoc/source Module_ooo.mk Repository.mk twain/M
Module_ooo.mk | 15 + Repository.mk |1 autodoc/Executable_autodoc.mk | 305 + autodoc/Makefile | 32 +++ autodoc/Module_autodoc.mk | 14 - autodoc/prj/build.lst | 67 -- autodoc/prj/d.lst |3 autodoc/prj/makefile.mk| 52 +--- autodoc/source/ary/cpp/makefile.mk | 76 --- autodoc/source/ary/doc/makefile.mk | 54 - autodoc/source/ary/idl/makefile.mk | 83 --- autodoc/source/ary/info/makefile.mk| 56 - autodoc/source/ary/kernel/makefile.mk | 59 - autodoc/source/ary/loc/makefile.mk | 57 - autodoc/source/ary_i/kernel/makefile.mk| 56 - autodoc/source/display/html/makefile.mk| 74 --- autodoc/source/display/idl/makefile.mk | 73 -- autodoc/source/display/toolkit/makefile.mk | 60 - autodoc/source/exes/adc_uni/makefile.mk| 100 - autodoc/source/parser/adoc/makefile.mk | 58 - autodoc/source/parser/cpp/makefile.mk | 83 --- autodoc/source/parser/kernel/makefile.mk | 54 - autodoc/source/parser/tokens/makefile.mk | 58 - autodoc/source/parser_i/idl/makefile.mk| 80 --- autodoc/source/parser_i/idoc/makefile.mk | 58 - autodoc/source/parser_i/tokens/makefile.mk | 59 - twain/Makefile | 32 +++ twain/Module_twain.mk | 34 --- twain/Package_inc.mk | 26 ++ twain/prj/build.lst|3 twain/prj/d.lst|3 twain/prj/makefile.mk | 49 +--- 32 files changed, 461 insertions(+), 1373 deletions(-) New commits: commit ee34e88d5e6effdbfb88ff63a98e779bfd7fff05 Author: Damjan Jovanovic <dam...@apache.org> Date: Thu Mar 29 00:45:19 2018 + Port main/twain to gbuild. Update Module_ooo.mk. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index 3ca9deb8ed6b..ea4d80539b67 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ MathMLDTD \ UnoControls \ animations \ +autodoc \ automation \ avmedia \ basctl \ @@ -36,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ canvas \ comphelper \ configmgr \ +cosv \ cppcanvas \ cui \ dbaccess \ @@ -52,17 +54,18 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ idl \ io \ javaunohelper \ +jvmaccess \ linguistic \ o3tl \ offapi \ oovbaapi \ oox \ -padmin \ package \ +padmin \ rdbmaker \ registry \ -reportdesign \ remotebridges \ +reportdesign \ sane \ sax \ sc \ @@ -80,15 +83,19 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sw \ toolkit \ tools \ +twain \ +ucb \ ucbhelper \ udkapi \ +udm \ +unixODBC \ +unodevtools \ unotools \ unoxml \ uui \ vbahelper \ vcl \ -udm \ -unixODBC \ +vos \ wizards \ writerfilter \ x11_extensions \ diff --git a/twain/Makefile b/twain/Makefile new file mode 100644 index ..c1d144cbd4c9 --- /dev/null +++ b/twain/Makefile @@ -0,0 +1,32 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/twain/util/makefile.mk b/twain/Module_twain.mk similarity index 83% rename from twain/util/makefile.mk rename to twain/Module_twain.mk index 497d7832b73d..5cf3fa88a04a 100644 --- a/twain/util/makefile.mk +++ b/twain/Module
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - RepositoryFixes.mk Repository.mk solenv/gbuild
Repository.mk|4 ++-- RepositoryFixes.mk | 11 --- solenv/gbuild/Library.mk |5 + 3 files changed, 11 insertions(+), 9 deletions(-) New commits: commit c2a248c822c7ddff365ca266cf2e71f8178635a7 Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Mar 25 07:14:42 2018 + Move reg and store to UNOVERLIBS, as they are definitely URE libraries as per main/ure/source/README, and deal with their unusual names in RepositoryFixes.mk. Also remove special handling for them in gbuild. Patch by: me diff --git a/Repository.mk b/Repository.mk index c9dd1cad9384..7c9f570f506c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -173,8 +173,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ -reg \ -store \ xmlreader \ )) @@ -244,7 +242,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ jvmfwk \ +reg \ sal \ +store \ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 09fc2044c10f..a3440d428381 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -31,8 +31,10 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES)) gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) @@ -44,7 +46,9 @@ ifeq ($(OS),SOLARIS) gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) #$(info libnames: $(gb_Library_FILENAMES)) endif @@ -54,7 +58,9 @@ ifeq ($(OS),MACOSX) gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++ gb_Library_FILENAMES := $(patsubst stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES)) @@ -83,7 +89,6 @@ gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) @@ -142,7 +147,6 @@ gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAME gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(pa
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - jvmaccess/inc jvmaccess/Library_jvmaccess.mk jvmaccess/Makefile jvmaccess/Module_jvmaccess.mk jvmaccess/Package_inc.mk jvmaccess/prj jv
Repository.mk |2
jvmaccess/Library_jvmaccess.mk| 70 ++
jvmaccess/Makefile| 32 +++
jvmaccess/Module_jvmaccess.mk | 18 ++
jvmaccess/Package_inc.mk | 29 ++
jvmaccess/inc/jvmaccess/classpath.hxx |5 +
jvmaccess/inc/jvmaccess/jvmaccessdllapi.h | 37 +
jvmaccess/inc/jvmaccess/unovirtualmachine.hxx |5 +
jvmaccess/inc/jvmaccess/virtualmachine.hxx|7 +-
jvmaccess/prj/build.lst |4 -
jvmaccess/prj/d.lst |9 ---
jvmaccess/prj/makefile.mk | 50 +-
jvmaccess/util/gcc3.map |8 +-
jvmaccess/util/mingw.map |8 +-
store/inc/store/store.h | 51 +-
store/source/store.cxx| 50 +-
16 files changed, 261 insertions(+), 124 deletions(-)
New commits:
commit 2fdf81edc591a1b46ada64474800e36855b88b1c
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sat Mar 24 00:50:48 2018 +
Export the right main/store symbols.
Patch by: me
diff --git a/store/inc/store/store.h b/store/inc/store/store.h
index 1cecdd8aa390..351e33b5e69b 100644
--- a/store/inc/store/store.h
+++ b/store/inc/store/store.h
@@ -25,6 +25,7 @@
#define _STORE_STORE_H_ "$Revision$"
#include
+#include
#ifdef __cplusplus
extern "C" {
@@ -39,7 +40,7 @@ typedef void* storeHandle;
@param Handle [in] the Handle.
@return store_E_None upon success
*/
-storeError SAL_CALL store_acquireHandle (
+STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle (
storeHandle Handle
) SAL_THROW_EXTERN_C();
@@ -49,7 +50,7 @@ storeError SAL_CALL store_acquireHandle (
@return store_E_None upon success,
store_E_InvalidHandle otherwise.
*/
-storeError SAL_CALL store_releaseHandle (
+STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle (
storeHandle Handle
) SAL_THROW_EXTERN_C();
@@ -66,7 +67,7 @@ typedef void* storeFileHandle;
@param phFile [out] the File Handle.
@return store_E_None upon success
*/
-storeError SAL_CALL store_createMemoryFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile (
sal_uInt16 nPageSize,
storeFileHandle *phFile
) SAL_THROW_EXTERN_C();
@@ -84,7 +85,7 @@ storeError SAL_CALL store_createMemoryFile (
@param phFile [out] the File Handle.
@return store_E_None upon success
*/
-storeError SAL_CALL store_openFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_openFile (
rtl_uString *pFilename,
storeAccessMode eAccessMode,
sal_uInt16 nPageSize,
@@ -97,7 +98,7 @@ storeError SAL_CALL store_openFile (
@return store_E_None upon success,
store_E_InvalidHandle otherwise.
*/
-storeError SAL_CALL store_closeFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeFile (
storeFileHandle hFile
) SAL_THROW_EXTERN_C();
@@ -106,7 +107,7 @@ storeError SAL_CALL store_closeFile (
@param hFile [in] the File Handle.
@return store_E_None upon success
*/
-storeError SAL_CALL store_flushFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_flushFile (
storeFileHandle hFile
) SAL_THROW_EXTERN_C();
@@ -116,7 +117,7 @@ storeError SAL_CALL store_flushFile (
@param pnRefCount [out] number of open directories and streams.
@return store_E_None upon success
*/
-storeError SAL_CALL store_getFileRefererCount (
+STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount (
storeFileHandle hFile,
sal_uInt32 *pnRefCount
) SAL_THROW_EXTERN_C();
@@ -127,7 +128,7 @@ storeError SAL_CALL store_getFileRefererCount (
@param pnSize [out] the file size in bytes.
@return store_E_None upon success
*/
-storeError SAL_CALL store_getFileSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize (
storeFileHandle hFile,
sal_uInt32 *pnSize
) SAL_THROW_EXTERN_C();
@@ -140,7 +141,7 @@ storeError SAL_CALL store_getFileSize (
@param pDstFilename [in] created with store_AccessCreate.
@return store_E_None upon success
*/
-storeError SAL_CALL store_rebuildFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile (
rtl_uString *pSrcFilename,
rtl_uString *pDstFilename
) SAL_THROW_EXTERN_C();
@@ -162,7 +163,7 @@ typedef void* storeDirectoryHandle;
@param phDirectory [out] the Directory Handle.
@return store_E_None upon success
*/
-storeError SAL_CALL store_openDirectory (
+STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory (
storeFileHandle hFile,
rtl_uString *pPath,
rtl_uString *pName,
@@ -176,7 +177,7 @@ storeError SAL_CALL store_openDirectory (
@return store_E_None upon success,
store
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - jvmaccess/inc jvmaccess/util RepositoryExternal.mk solenv/inc
RepositoryExternal.mk | 15 ++-
jvmaccess/inc/jvmaccess/unovirtualmachine.hxx |4
jvmaccess/inc/jvmaccess/virtualmachine.hxx|4
jvmaccess/util/gcc3.map |8
jvmaccess/util/mingw.map |8
solenv/inc/libs.mk|3 +--
6 files changed, 31 insertions(+), 11 deletions(-)
New commits:
commit c4fa038b68d36e8b91ed7613180761bbe86f21e9
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sat Mar 31 08:16:54 2018 +
The main/jvmaccess module stubbornly refuses to build on all setups.
As per https://gcc.gnu.org/wiki/Visibility
it turns out that GCC needs a typeinfo lookup when exceptions are
thrown between different shared libraries. This means main/jvmaccess
needs to export typeinfos for its exception classes. However on
Windows this breaks the build due to missing array new in its
base class, so typeinfos mustn't be exported for the build to
succeed. Thus, we don't export the typeinfo from the exception
classes on Windows, but we do export it on other setups.
(The more I work with C++, the more I hate it.)
Patch by: me
diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
index 1e85c131fd30..b20b7bad984d 100644
--- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
@@ -40,7 +40,11 @@ class UnoVirtualMachine: public
salhelper::SimpleReferenceObject {
public:
/** An exception indicating failure to create a UnoVirtualMachine.
*/
+#if defined _MSC_VER
class CreationException
+#else
+class JVMACCESS_DLLPUBLIC CreationException
+#endif
{
public:
JVMACCESS_DLLPUBLIC CreationException();
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index 8ea6136bf342..6d28c1da3422 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -59,7 +59,11 @@ public:
public:
/** An exception indicating failure to create an AttachGuard.
*/
+#if defined _MSC_VER
class CreationException
+#else
+class JVMACCESS_DLLPUBLIC CreationException
+#endif
{
public:
JVMACCESS_DLLPUBLIC CreationException();
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 1df8c297a15b..1bc94dc25a1b 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -28,8 +28,8 @@ UDK_3.1 {
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_;
#
jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException
const &)
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; #
jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_;
# jvmaccess::VirtualMachine::AttachGuard::CreationException::operator
=(CreationException const &)
-# _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
-# _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
+_ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
+_ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; #
typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
_ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE;
# jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference<
VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE;
# jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference<
VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; #
jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
@@ -68,8 +68,8 @@ UDK_3.3 {
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; #
jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; #
jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; #
jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException
const &)
-# _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
for jvmaccess::UnoVirtualMachine::CreationException
-# _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo
name for jvmaccess
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk store/inc store/Library_store.mk store/Makefile store/Module_store.mk store/Package_inc.mk store/Package_xml.mk store/prj store/sourc
Module_ooo.mk|1 store/Library_store.mk | 60 +++ store/Makefile | 32 + store/Module_store.mk| 32 + store/Package_inc.mk | 29 ++ store/Package_xml.mk | 26 store/inc/store/dllapi.h | 36 store/prj/build.lst |5 --- store/prj/d.lst | 14 -- store/prj/makefile.mk| 44 ++ store/source/store.cxx | 51 --- 11 files changed, 287 insertions(+), 43 deletions(-) New commits: commit 5834b49bda6a4a8fbca19a0dc38f5ad4f4f16f53 Author: Damjan Jovanovic <dam...@apache.org> Date: Fri Mar 23 00:18:40 2018 + Port main/store to gbuild. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index e01beeae1d80..3ca9deb8ed6b 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ slideshow \ sot \ starmath \ +store \ svgio \ svl \ svtools \ diff --git a/store/Library_store.mk b/store/Library_store.mk new file mode 100644 index ..d0ab42300e18 --- /dev/null +++ b/store/Library_store.mk @@ -0,0 +1,60 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Library_Library,store)) + +$(eval $(call gb_Library_add_precompiled_header,store,$(SRCDIR)/store/inc/pch/precompiled_store)) + +$(eval $(call gb_Library_set_versionmap,store,$(SRCDIR)/store/util/store.map)) + +$(eval $(call gb_Library_set_include,store,\ +$$(INCLUDE) \ + -I$(SRCDIR)/store/inc \ + -I$(SRCDIR)/store/inc/pch \ +)) + +$(eval $(call gb_Library_add_defs,store,\ + -DSTORE_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,store,\ + sal \ + $(gb_STDLIBS) \ +)) + + +$(eval $(call gb_Library_add_noexception_objects,store,\ + store/source/object \ + store/source/lockbyte \ + store/source/storbase \ + store/source/storbios \ + store/source/storcach \ + store/source/stordata \ + store/source/stordir \ + store/source/storlckb \ + store/source/stortree \ + store/source/storpage \ + store/source/store \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/store/Makefile b/store/Makefile new file mode 100644 index ..c1d144cbd4c9 --- /dev/null +++ b/store/Makefile @@ -0,0 +1,32 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/store/Module_store.mk b/store/Module_store.mk new file mode 100644 index ..1da703ced721 --- /dev/null +++ b/store/Module_store.mk @@ -0,0 +1,32 @@ +#*
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - Module_ooo.mk registry/Executable_checksingleton.mk registry/Executable_rdbedit.mk registry/Executable_regcompare.mk registry/Executabl
Module_ooo.mk |1 Repository.mk | 14 + registry/Executable_checksingleton.mk | 49 +++ registry/Executable_rdbedit.mk | 39 +++ registry/Executable_regcompare.mk | 48 ++ registry/Executable_regmerge.mk| 47 ++ registry/Executable_regview.mk | 46 ++ registry/Library_reg.mk| 64 + registry/Makefile | 32 registry/Module_registry.mk| 38 ++ registry/Package_inc.mk| 37 ++ registry/inc/registry/reader.h | 69 +-- registry/inc/registry/reflread.hxx |3 - registry/inc/registry/reflwrit.hxx |3 - registry/inc/registry/registry.h | 67 +- registry/inc/registry/registry.hxx |3 - registry/inc/registry/registrydllapi.h | 37 ++ registry/inc/registry/writer.h | 19 +++ registry/prj/build.lst |7 -- registry/prj/d.lst | 20 --- registry/prj/makefile.mk | 41 registry/tools/makefile.mk | 84 - registry/util/makefile.mk | 72 solenv/gbuild/Deliver.mk |4 - solenv/gbuild/Library.mk |9 +++ solenv/gbuild/gbuild.mk|2 solenv/gbuild/platform/freebsd.mk | 16 +- solenv/gbuild/platform/linux.mk| 15 + solenv/gbuild/platform/solaris.mk | 15 + 29 files changed, 593 insertions(+), 308 deletions(-) New commits: commit 0ae30994cefb0a39d0dd1b8b3c10045fd765a069 Author: Damjan Jovanovic <dam...@apache.org> Date: Thu Mar 22 06:22:38 2018 + Add registry to Module_ooo.mk Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index a0b3b1b65de0..e01beeae1d80 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ padmin \ package \ rdbmaker \ +registry \ reportdesign \ remotebridges \ sane \ commit fa6e37ede484ef12706fc0df45e6143083c12392 Author: Damjan Jovanovic <dam...@apache.org> Date: Thu Mar 22 05:29:37 2018 + Implement the ability to build "UDK versioned" libraries in gbuild for *nix platforms. Do this by setting the ELF SONAME to the libxyz.so.3 style library output name, changing the output file that the linker writes to to be in this format (from libxyz.so), making a symlink from libxyz.so to libxyz.so.3, adding libxyz.so.3 as a delivery AUXTARGET for the deliverable libxyz.so, and changing the deliver commands to copy symlinks properly. This is all what dmake does too. Use this to port main/registry to gbuild. Patch by: me diff --git a/Repository.mk b/Repository.mk index a485eb47ffca..40a240fa7650 100644 --- a/Repository.mk +++ b/Repository.mk @@ -27,8 +27,10 @@ $(eval $(call gb_Helper_register_repository,SRCDIR)) $(eval $(call gb_Helper_register_executables,NONE, \ bmp \ bmpsum \ +checksingleton \ g2g \ mkunroll \ +rdbedit \ rdbmaker \ rscdep \ so_checksum \ @@ -42,6 +44,15 @@ $(eval $(call gb_Helper_register_executables,OOO, \ spadmin.bin \ )) +$(eval $(call gb_Helper_register_executables,SDK, \ +regcompare \ +)) + +$(eval $(call gb_Helper_register_executables,UREBIN, \ +regmerge \ +regview \ +)) + $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ AppleRemote \ adabas \ @@ -101,7 +112,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ oox \ package2 \ qstart_gtk \ -reg \ rpt \ rptui \ rptxml \ @@ -163,6 +173,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ +reg \ +store \ xmlreader \ )) diff --git a/registry/Executable_checksingleton.mk b/registry/Executable_checksingleton.mk new file mode 100644 index ..6167df920b07 --- /dev/null +++ b/registry/Executable_checksingleton.mk @@ -0,0 +1,49 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# softwa
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - oowintool
oowintool | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit eccdc9780579dc9e762fd9760206b752ec5c36d5
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sat Mar 3 11:06:53 2018 +
Add Java 1.9 detection to oowintool.
Patch by: me
diff --git a/oowintool b/oowintool
index 8ebdae5dcd67..9d98e24720d7 100755
--- a/oowintool
+++ b/oowintool
@@ -289,8 +289,16 @@ sub print_jdk_dir()
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.5/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.4/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\
Development\ Kit/1.3/JavaHome");
-defined $dir || exit 1;
-print cygpath($dir, 'w', $output_format);
+if (defined $dir) {
+print cygpath($dir, 'w', $output_format);
+} else {
+# Java 1.9 had to be different:
+my $currentVersion = reg_get_value
("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/CurrentVersion");
+defined $currentVersion || exit 1;
+my $newDir = reg_get_value
("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/" . $currentVersion . "/JavaHome");
+defined $newDir || exit 1;
+print cygpath($newDir, 'w', $output_format);
+}
}
sub print_nsis_dir()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/src
solenv/src/dmake-cygwin64.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 818212990152aa9757d4f0e27adca1ad743be79d Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Mar 4 08:39:49 2018 + Fix a Windows build-breaking bug introduced in my last commit, caused by the wrong conversion direction between POSIX and Windows paths in 1 dmake function. Patch by: me diff --git a/solenv/src/dmake-cygwin64.patch b/solenv/src/dmake-cygwin64.patch index fabeb561b206..b363cb21464e 100644 --- a/solenv/src/dmake-cygwin64.patch +++ b/solenv/src/dmake-cygwin64.patch @@ -41,7 +41,7 @@ diff -Nur sysintf.c sysintf.c char *tmp; - int err = cygwin_conv_to_win32_path(src, buf); - if (err) -+ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, src, buf, PATH_MAX); ++ int err = cygwin_conv_path(CCP_POSIX_TO_WIN_A, src, buf, PATH_MAX); + if (err < 0) Fatal( "error converting \"%s\" - %s\n", src, strerror (errno)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1 solenv/src
bootstrap.1 |6 +
solenv/src/dmake-cygwin64.patch | 48
2 files changed, 54 insertions(+)
New commits:
commit 229b54c679debb0f60569e46520db85fc5d3b4a1
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Mar 4 06:52:50 2018 +
dmake's config.guess is too old to detect Cygwin64, so
overwrite it with our own one during ./bootstrap.
dmake uses Cygwin API functions that were deprecated
on Cygwin32 and are obsolete on Cygwin64, so patch
it to use the replacement APIs during ./bootstrap
as well.
Patch by: me
diff --git a/bootstrap.1 b/bootstrap.1
index 41a09acb736e..7ef41bb8af76 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -136,6 +136,12 @@ if test -n "$DMAKE_URL" -a ! -x
"$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then
$GNUMAKE distclean || exit
fi
+# The config.guess for dmake is too old, overwrite it with ours:
+cp $SOLARSRC/config.guess .
+
+# We also need to patch dmake for Win64
+patch -p0 < $SOLARSRC/solenv/src/dmake-cygwin64.patch
+
./configure $DMAKE_CONF || exit
## invoke the gnu make command set by configure.
diff --git a/solenv/src/dmake-cygwin64.patch b/solenv/src/dmake-cygwin64.patch
new file mode 100644
index ..fabeb561b206
--- /dev/null
+++ b/solenv/src/dmake-cygwin64.patch
@@ -0,0 +1,48 @@
+diff -Nur path.c path.c
+--- path.c 2011-09-25 18:53:42.0 +0200
path.c 2018-03-04 08:13:24.836905800 +0200
+@@ -317,8 +317,8 @@
+ #if __CYGWIN__
+/* Use cygwin function to convert a DOS path to a POSIX path. */
+if( *path && path[1] == ':' && isalpha(*path) ) {
+- int err = cygwin_conv_to_posix_path(path, cpath);
+- if (err)
++ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, path, cpath, PATH_MAX);
++ if (err < 0)
+Fatal( "error converting \"%s\" - %s\n",
+ path, strerror (errno));
+ if( path[2] != '/' && path[2] != '\\' )
+diff -Nur sysintf.c sysintf.c
+--- sysintf.c 2011-09-25 18:53:42.0 +0200
sysintf.c 2018-03-04 08:15:54.315421400 +0200
+@@ -69,7 +69,7 @@
+ # include
+ #endif
+
+-/* for cygwin_conv_to_posix_path() in Prolog() and for cygdospath()*/
++/* for cygwin_conv_path() in Prolog() and for cygdospath()*/
+ #if __CYGWIN__
+ # include
+ #endif
+@@ -538,8 +538,8 @@
+if ( (CygDrvPre = MALLOC( PATH_MAX, char)) == NIL(char) )
+ No_ram();
+else {
+- int err = cygwin_conv_to_posix_path("c:", CygDrvPre);
+- if (err)
++ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, "c:", CygDrvPre,
PATH_MAX);
++ if (err < 0)
+Fatal( "error converting \"%s\" - %s\n",
+ CygDrvPre, strerror (errno));
+ if( (CygDrvPreLen = strlen(CygDrvPre)) == 2 ) {
+@@ -1144,8 +1144,8 @@
+
+if( *src && src[0] == '/' ) {
+ char *tmp;
+- int err = cygwin_conv_to_win32_path(src, buf);
+- if (err)
++ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, src, buf, PATH_MAX);
++ if (err < 0)
+Fatal( "error converting \"%s\" - %s\n",
+ src, strerror (errno));
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in
set_soenv.in |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 7c02cabd41ec70bda3a98e1e49e83c608ec93d3a Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Mar 4 16:46:55 2018 + Fix indentation. Patch by: me diff --git a/set_soenv.in b/set_soenv.in index 16d37ae9de8f..b894a6935279 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -732,10 +732,10 @@ elsif ( $platform =~ m/cygwin/ ) die "Unsupported value for COMEX variable.\n"; } } - print "Setting W32 build with bash shell specific values... "; - # No speacial treatment for CC an CXX anymore. - $FLIPCMD= "slfl.pl"; - $PATH_SEPERATOR = ';'; + print "Setting W32 build with bash shell specific values... "; + # No special treatment for CC and CXX anymore. + $FLIPCMD= "slfl.pl"; + $PATH_SEPERATOR = ';'; } } elsif ( $platform =~ m/os2/ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - curl/makefile.mk
curl/makefile.mk | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit f57ea524e269128fbd6ff21e212e46f1248740b0 Author: Damjan Jovanovic <dam...@apache.org> Date: Mon Mar 5 05:09:34 2018 + Get main/curl to build 64 bit binaries on Win64. Patch by: me diff --git a/curl/makefile.mk b/curl/makefile.mk index 273b187b4633..0dcef1d53d15 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -107,11 +107,17 @@ EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" EXCFLAGS="/EHsc /YX" .ENDIF +.IF "$(CPUNAME)"=="INTEL" +curl_MACHINE:="X86" +.ELIF "$(CPUNAME)"=="X86_64" +curl_MACHINE:="X64" +.ENDIF + BUILD_DIR=.$/lib .IF "$(debug)"=="" -BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE) .ELSE -BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE) .ENDIF OUT2BIN=$(BUILD_DIR)$/libcurl.dll ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lucene/lucene-java-version.patch lucene/makefile.mk
lucene/lucene-java-version.patch | 39 +++
lucene/makefile.mk |2 ++
2 files changed, 41 insertions(+)
New commits:
commit 2c8f68fe4180a22a07c8a5ed335861d367c665ee
Author: Damjan Jovanovic <dam...@apache.org>
Date: Mon Mar 5 04:44:08 2018 +
The -source and -target options passed to javac
must be at least 1.6, to support building with
Java 1.9.
Patch by: me
diff --git a/lucene/lucene-java-version.patch b/lucene/lucene-java-version.patch
new file mode 100644
index ..ece4c37a0848
--- /dev/null
+++ b/lucene/lucene-java-version.patch
@@ -0,0 +1,39 @@
+--- misc/build/lucene-2.9.4/common-build.xml 2018-03-05 06:13:00.041924900
+0200
misc/build/lucene-2.9.4/common-build.xml 2018-03-05 06:34:48.448742000
+0200
+@@ -58,8 +58,8 @@
+
+
+
+-
+-
++
++
+
+ http://java.sun.com/j2se/1.4/docs/api/"/>
+
+--- misc/build/lucene-2.9.4/contrib/analyzers/common/build.xml 2010-11-28
02:22:13.0 +0200
misc/build/lucene-2.9.4/contrib/analyzers/common/build.xml 2018-03-05
06:39:48.913151800 +0200
+@@ -23,8 +23,8 @@
+ Additional Analyzers
+
+
+-
+-
++
++
+
+
+
+--- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2010-11-28 02:22:11.0 +0200
misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2018-03-05 06:41:07.207097100 +0200
+@@ -23,8 +23,8 @@
+ Smart Chinese Analyzer
+
+
+-
+-
++
++
+
+
+
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
index 4599ee569af0..3919de62ed17 100644
--- a/lucene/makefile.mk
+++ b/lucene/makefile.mk
@@ -62,6 +62,8 @@ PATCH_FILES=lucene.patch
PATCH_FILES+= long_path.patch
.ENDIF
+PATCH_FILES+=lucene-java-version.patch
+
BUILD_DIR=.
BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc
sal/inc/osl/endian.h |2 ++
sal/inc/sal/types.h | 15 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 9ab0a116fec8762da6ff31f2e103d5a2a7dae8ae
Author: Damjan Jovanovic <dam...@apache.org>
Date: Mon Mar 5 17:31:41 2018 +
Add some initial fixes for Win64 in main/sal.
Patch by: me
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index b1a010922f58..3ea794f1a096 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -35,6 +35,8 @@ extern "C" {
#ifdef _WIN32
# if defined(_M_IX86)
# define _LITTLE_ENDIAN
+# elif defined(_M_AMD64)
+# define _LITTLE_ENDIAN
# elif defined(_M_MRX000)
# define _LITTLE_ENDIAN
# elif defined(_M_ALPHA)
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 1f4a0fedd077..7bf1685848ba 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -29,7 +29,7 @@
/* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
#if defined UNX
#include
-#elif defined(WNT) || defined(OS2)
+#elif defined(WNT)
/* FIXME: autogeneration of type sizes on Win32/Win64? */
#define SAL_TYPES_ALIGNMENT2 1
#define SAL_TYPES_ALIGNMENT4 1
@@ -38,6 +38,19 @@
#define SAL_TYPES_SIZEOFINT 4
#define SAL_TYPES_SIZEOFLONG 4
#define SAL_TYPES_SIZEOFLONGLONG 8
+ #if defined(_M_IX86)
+#define SAL_TYPES_SIZEOFPOINTER 4
+ #elif defined(_M_AMD64)
+#define SAL_TYPES_SIZEOFPOINTER 8
+ #endif
+#elif defined(OS2)
+ #define SAL_TYPES_ALIGNMENT2 1
+ #define SAL_TYPES_ALIGNMENT4 1
+ #define SAL_TYPES_ALIGNMENT8 1
+ #define SAL_TYPES_SIZEOFSHORT 2
+ #define SAL_TYPES_SIZEOFINT 4
+ #define SAL_TYPES_SIZEOFLONG 4
+ #define SAL_TYPES_SIZEOFLONGLONG 8
#define SAL_TYPES_SIZEOFPOINTER 4
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/osl solenv/inc solenv/win64
sal/osl/w32/file.cxx |4 solenv/inc/wntmscx.mk| 398 +++ solenv/win64/readme.txt |2 solenv/win64/win64.patch | 254 + 4 files changed, 656 insertions(+), 2 deletions(-) New commits: commit dc344511236f5698afd1c002be1ef050ab37c877 Author: Damjan Jovanovic <dam...@apache.org> Date: Mon Mar 5 20:19:07 2018 + Fix use of ::std::min and ::std::max on types of different sizes. Patch by: me diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 9321ab4a8a19..9bfb08e25915 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -420,7 +420,7 @@ oslFileError FileHandle_Impl::readFileAt ( return osl_File_E_None; } -SIZE_T const bytes = std::min(m_buflen - bufpos, nBytesRequested); +SIZE_T const bytes = std::min(m_buflen - bufpos, (SIZE_T)nBytesRequested); memcpy (&(buffer[*pBytesRead]), &(m_buffer[bufpos]), bytes); nBytesRequested -= bytes, *pBytesRead += bytes, nOffset += bytes; } @@ -490,7 +490,7 @@ oslFileError FileHandle_Impl::writeFileAt ( m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone); } -SIZE_T const bytes = std::min(m_bufsiz - bufpos, nBytesToWrite); +SIZE_T const bytes = std::min(m_bufsiz - bufpos, (SIZE_T)nBytesToWrite); memcpy (&(m_buffer[bufpos]), &(buffer[*pBytesWritten]), bytes); nBytesToWrite -= bytes, *pBytesWritten += bytes, nOffset += bytes; commit d9da41596ac929c64e10337ef08f54dbcf4fca80 Author: Damjan Jovanovic <dam...@apache.org> Date: Mon Mar 5 20:12:17 2018 + Add the preliminary patch for the Win64 build into main/solenv/win64. Don't apply it to the tree yet, as it will break building 32 bit AOO on 64 bit Windows. Patch by: me diff --git a/solenv/win64/readme.txt b/solenv/win64/readme.txt new file mode 100644 index ..2dac1a5bf364 --- /dev/null +++ b/solenv/win64/readme.txt @@ -0,0 +1,2 @@ +Please refer to https://wiki.openoffice.org/wiki/Win64_port +for instructions. diff --git a/solenv/win64/win64.patch b/solenv/win64/win64.patch new file mode 100644 index ..ff17fc5e4865 --- /dev/null +++ b/solenv/win64/win64.patch @@ -0,0 +1,254 @@ +Index: configure.ac +=== +--- configure.ac (revision 1825802) configure.ac (working copy) +@@ -2116,18 +2116,27 @@ + PATH="$MSPDB_PATH:$PATH" + + AC_MSG_CHECKING([the Microsoft C/C++ Compiler]) +- if test -x "$with_cl_home/bin/cl.exe"; then +- CC="$with_cl_home/bin/cl.exe" +- else +- AC_PATH_PROG(CC, cl.exe) +- fi +- if test -e "$CC"; then ++ case "$build_cpu" in ++i?86) ++ cl_subdirectory="bin" ++ ;; ++x86_64) ++ cl_subdirectory="bin/amd64" ++ ;; ++*) ++ AC_MSG_ERROR([Unknown/unsupported CPU.]) ++ ;; ++ esac ++ if test -x "$with_cl_home/$cl_subdirectory/cl.exe"; then ++ CC="$with_cl_home/$cl_subdirectory/cl.exe" ++ COMPATH="$with_cl_home" + # This gives us a posix path with 8.3 filename restrictions + CC=`cygpath -d "$CC"` + CC=`cygpath -u "$CC"` ++ COMPATH=`cygpath -d "$COMPATH"` ++ COMPATH=`cygpath -u "$COMPATH"` + # Remove /cl.exe from CC case insensitive + AC_MSG_RESULT([found ($CC)]) +- COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` + export INCLUDE=`cygpath -d "$COMPATH/Include"` + dnl Check which Microsoft C/C++ compiler is found + AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler]) +@@ -2150,7 +2159,7 @@ + AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2008.]) + fi + else +- AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.]) ++ AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home.]) + fi + else + AC_MSG_CHECKING([the Mingwin32 C++ Compiler]) +Index: set_soenv.in +=== +--- set_soenv.in
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - avmedia/Library_avmediagst.mk avmedia/source
avmedia/Library_avmediagst.mk|8 ++
avmedia/source/gstreamer/gstframegrabber.cxx |4 +--
avmedia/source/gstreamer/gstplayer.cxx | 33 ---
3 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 378713d7be8867784f3c7a448898f12e485aa984
Author: Damjan Jovanovic <dam...@apache.org>
Date: Fri Mar 2 06:14:01 2018 +
Use gstreamer 1.0 instead of the long obsolete
version 0.1.
Embed the window into the document properly,
by setting the window id on the GstVideoOverlay
using gst_video_overlay_set_window_handle()
after window creation in Player::createPlayerWindow().
Add better logging.
Patch by: me
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index d583e7398d6b..212adde3279c 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -31,12 +31,11 @@ $(eval $(call gb_Library_set_include,avmediagst,\
$$(INCLUDE) \
-I$(SRCDIR)/avmedia/inc \
-I$(SRCDIR)/avmedia/source/inc \
- $(filter -I%,$(GTK_CFLAGS)) \
- $(shell pkg-config --cflags-only-I gstreamer-0.10
gstreamer-interfaces-0.10) \
+ $(filter -I%,$(GSTREAMER_CFLAGS)) \
))
$(eval $(call gb_Library_add_cflags,avmediagst,\
- $(filter-out -I%,$(GTK_CFLAGS)) \
+ $(filter-out -I%,$(GSTREAMER_CFLAGS)) \
))
ifeq ($(OS),MACOSX)
@@ -62,8 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,avmediagst,\
))
$(eval $(call gb_Library_add_libs,avmediagst,\
- $(GTK_LIBS) \
- $(shell pkg-config --libs gstreamer-0.10 gstreamer-interfaces-0.10) \
+ $(GSTREAMER_LIBS) \
))
$(eval $(call gb_Library_add_exception_objects,avmediagst,\
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx
b/avmedia/source/gstreamer/gstframegrabber.cxx
index 6467aa0e007c..1f23680ba1dd 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -130,9 +130,9 @@ gboolean FrameGrabber::busCallback( GstBus* pBus,
GstMessage* pMsg )
{
bool bDone = false;
-if( pMsg && pMsg->structure )
+if( pMsg && gst_message_get_structure( pMsg ) )
{
-GstStructure* pStruct = pMsg->structure;
+const GstStructure* pStruct = gst_message_get_structure( pMsg );
const gchar* pStructName = gst_structure_get_name( pStruct );
if( ( ::std::string( pStructName ).find( "pixbuf" ) !=
::std::string::npos ) &&
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 63003de836c0..6741146e6ac7 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
// maximum timeout time in nanoseconds
@@ -312,10 +312,7 @@ double SAL_CALL Player::getDuration()
if( implInitPlayer() )
{
-GstFormat aFormat = GST_FORMAT_TIME;
-
-if( !gst_element_query_duration( mpPlayer, , ) ||
- ( GST_FORMAT_TIME != aFormat ) ||
+if( !gst_element_query_duration( mpPlayer, GST_FORMAT_TIME,
) ||
( nDuration < 0 ) )
{
nDuration = 0;
@@ -348,11 +345,9 @@ double SAL_CALL Player::getMediaTime()
::osl::MutexGuard aGuard(m_aMutex);
if( implInitPlayer() )
{
-GstFormat aFormat = GST_FORMAT_TIME;
gint64 nCurTime = 0;
-if( gst_element_query_position( mpPlayer, , ) &&
- ( GST_FORMAT_TIME == aFormat ) &&
+if( gst_element_query_position( mpPlayer, GST_FORMAT_TIME, )
&&
( nCurTime >= 0 ) )
{
fRet = static_cast< double >( nCurTime ) / NANO_TIME_FACTOR;
@@ -539,6 +534,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow(
if( !pPlayerWindow->create( rArguments ) )
{
+OSL_ENSURE( false, "could not create player window\n" );
xRet.clear();
}
else
@@ -557,8 +553,12 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow(
gst_element_get_state( mpPlayer, , NULL,
GST_MAX_TIMEOUT );
gst_element_set_state( mpPlayer, GST_STATE_READY );
g_object_set( mpPlayer, "video-sink", pVideoSink, NULL );
+gst_video_overlay_set_window_handle( GST_VIDEO_OVERLAY(
mpPlayer ),
+pPlayerWindow->getXWindowHandle() );
gst_element_set_state( mpPlayer, aOldState );
}
+else
+OSL_ENSURE( false, "no video sink available\n" );
}
}
@@ -756,7 +756,7 @@ void Player::implHandleNewPadFunc( GstElement* pElement,
g_free( pElementName );
#endif
-GstCaps* pCaps = gst_pad_get_caps( pP
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/settings
odk/settings/settings.mk |8 1 file changed, 8 insertions(+) New commits: commit 7a13aeb63e3246f31c653d4c7dc9e5f7d5404339 Author: Damjan Jovanovic <dam...@apache.org> Date: Tue Mar 6 06:14:02 2018 + Win64 has the "mscx" CPPU_ENV. Patch by: me diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 0976ec27b988..f22d2d1eedb2 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -57,6 +57,8 @@ JAVABIN=bin ifeq "$(PLATFORM)" "windows" # Settings for Windows using Microsoft compiler/linker +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 's/^i.86$$/i386/') + OS=WIN PS=\\ ICL=$$ @@ -119,8 +121,14 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu # define for used compiler necessary for UNO # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x +ifeq "$(PROCTYPE)" "i386" CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci +endif +ifeq "$(PROCTYPE)" "x86_64" +CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx +CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx +endif CC_OUTPUT_SWITCH=-Fo LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - tools/GoogleTest_tools_pathutils.mk tools/Module_tools.mk tools/qa
tools/GoogleTest_tools_pathutils.mk | 46
tools/Module_tools.mk |1
tools/qa/test_pathutils.cxx | 27 -
3 files changed, 63 insertions(+), 11 deletions(-)
New commits:
commit e665db4362b177a38f07a8392ebbb8f99ef6b6e9
Author: Damjan Jovanovic
AuthorDate: Sun Mar 31 18:17:42 2019 +
Commit: Damjan Jovanovic
CommitDate: Sun Mar 31 18:17:42 2019 +
Port a main/tools unit test from cppunit to gtest.
Patch by: me
diff --git a/tools/GoogleTest_tools_pathutils.mk
b/tools/GoogleTest_tools_pathutils.mk
new file mode 100644
index ..58e0c6f5f897
--- /dev/null
+++ b/tools/GoogleTest_tools_pathutils.mk
@@ -0,0 +1,46 @@
+#**
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,tools_pathutils))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,tools_pathutils, \
+ tools/qa/test_pathutils \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,tools_pathutils, \
+stl \
+tl \
+$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_GoogleTest_add_linked_static_libs,tools_pathutils, \
+ooopathutils \
+))
+
+$(eval $(call gb_GoogleTest_set_include,tools_pathutils,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/inc \
+ -I$(SRCDIR)/tools/inc/pch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index 53a984177ad8..5f4ec4c6f488 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,tools,\
ifeq ($(ENABLE_UNIT_TESTS),YES)
$(eval $(call gb_Module_add_check_targets,tools,\
GoogleTest_tools_fractiontest \
+GoogleTest_tools_pathutils \
))
endif
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 2d771a1a3324..4e59b445b1f6 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.cxx
@@ -26,7 +26,7 @@
#include
-#include "testshl/simpleheader.hxx"
+#include "gtest/gtest.h"
#include "tools/pathutils.hxx"
namespace {
@@ -38,8 +38,8 @@ void buildPath(
wchar_t p[MAX_PATH];
wchar_t * e = tools::buildPath(
p, front, front + std::wcslen(front), back, std::wcslen(back));
-CPPUNIT_ASSERT_EQUAL(p + std::wcslen(path), e);
-CPPUNIT_ASSERT_EQUAL(0, std::wcscmp(path, p));
+ASSERT_EQ(p + std::wcslen(path), e);
+ASSERT_EQ(0, std::wcscmp(path, p));
#else
(void) front;
(void) back;
@@ -47,16 +47,18 @@ void buildPath(
#endif
}
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void testBuildPath();
+void SetUp()
+{
+}
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testBuildPath);
-CPPUNIT_TEST_SUITE_END();
+void TearDown()
+{
+}
};
-void Test::testBuildPath() {
+TEST_F(Test, testBuildPath) {
buildPath(L"a:\\b\\", L"..", L"a:\\");
buildPath(L"a:\\b\\", L"..\\", L"a:\\");
buildPath(L"a:\\b\\c\\", L"..\\..\\..\\d", L"a:\\..\\d");
@@ -65,8 +67,11 @@ void Test::testBuildPath() {
buildPath(L"", L"..\\a", L"..\\a");
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+}
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(, argv);
+return RUN_ALL_TESTS();
}
-NOADDITIONAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk qadevOOo/Ant_OOoRunnerLight.mk qadevOOo/Ant_OOoRunner.mk qadevOOo/build.xml qadevOOo/java qadevOOo/JunitTest_qadevOOo_unoapi.mk qadev
Module_ooo.mk |1 qadevOOo/Ant_OOoRunner.mk | 27 +++ qadevOOo/Ant_OOoRunnerLight.mk | 27 +++ qadevOOo/JunitTest_qadevOOo_unoapi.mk | 42 ++--- qadevOOo/Makefile | 32 +++ qadevOOo/Module_qadevOOo.mk | 33 +-- qadevOOo/build.xml | 74 qadevOOo/java/OOoRunner/build.xml | 41 qadevOOo/java/OOoRunner/src/main/java/ifc/sheet/_XSheetAnnotationAnchor.java |2 qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OQueryDesign.java |2 qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OSingleSelectQueryComposer.java |2 qadevOOo/java/OOoRunner/src/main/java/util/FootnoteDsc.java |2 qadevOOo/java/OOoRunner/src/main/java/util/FormTools.java | 24 +- qadevOOo/java/OOoRunner/src/main/java/util/ParagraphDsc.java |2 qadevOOo/java/OOoRunner/src/main/java/util/ReferenceMarkDsc.java |2 qadevOOo/java/OOoRunner/src/main/java/util/ShapeDsc.java |6 qadevOOo/java/OOoRunner/src/main/java/util/StyleFamilyDsc.java |6 qadevOOo/java/OOoRunner/src/main/java/util/TableDsc.java |2 qadevOOo/java/OOoRunner/src/main/java/util/TextSectionDsc.java |2 qadevOOo/java/OOoRunnerLight/build.xml | 64 +++ qadevOOo/java/OOoRunnerLight/manifest |3 qadevOOo/prj/build.lst |6 qadevOOo/prj/d.lst |1 qadevOOo/prj/makefile.mk | 36 ++-- qadevOOo/runner/basicrunner/basichelper/makefile.mk | 43 - qadevOOo/runner/basicrunner/makefile.mk | 42 - qadevOOo/runner/makefile.mk | 56 -- qadevOOo/runner/util/compare/makefile.mk | 50 -- qadevOOo/runner/util/makefile.mk | 83 -- 29 files changed, 272 insertions(+), 441 deletions(-) New commits: commit ee4b7394ff7c027e09d885e66056a405fc3b0291 Author: Damjan Jovanovic AuthorDate: Sun May 12 09:34:12 2019 + Commit: Damjan Jovanovic CommitDate: Sun May 12 09:34:12 2019 + Port qadevOOo to gbuild/Ant. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index 6adeea125a71..271cf450925c 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -77,6 +77,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ padmin \ psprint_config \ pyuno \ +qadevOOo \ rdbmaker \ registry \ remotebridges \ diff --git a/qadevOOo/Ant_OOoRunner.mk b/qadevOOo/Ant_OOoRunner.mk new file mode 100644 index ..2b6c0ff661fe --- /dev/null +++ b/qadevOOo/Ant_OOoRunner.mk @@ -0,0 +1,27 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Ant_Ant,OOoRunner,$(SRCDIR)/qadevOOo/java/OOoRunner/build.xml)) + +# vim: set noet sw=4 ts=4: + diff --git a/qadevOOo/Ant_OOoRunnerLight.mk b/qadevOOo/Ant_OOoRunnerLight.mk new file mode 100644 index ..40471e803043 --- /dev/null +++ b/qadevOOo/Ant_OOoRunnerLight.mk @@ -0,0 +1,27 @@ +#** +# +# Licensed to
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/Library_i18npool.mk
i18npool/Library_i18npool.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3336e2088ba1dd1d07be81188ad5696fbaad193
Author: Damjan Jovanovic
AuthorDate: Mon Jul 8 19:51:50 2019 +
Commit: Damjan Jovanovic
CommitDate: Mon Jul 8 19:51:50 2019 +
Don't include icuversion.mk if it wasn't delivered (when using system ICU).
Fixes:
#i128148# build in trunk fails because of icu.
Patch by: me
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index caa159764bed..25892a581575 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -144,7 +144,7 @@
$(WORKDIR)/CustomTarget/i18npool/source/collator/lrl_include.hxx : $(wildcard $(
# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
-include $(OUTDIR)/inc/icuversion.mk
+-include $(OUTDIR)/inc/icuversion.mk
ICU_RECLASSIFIED_BRACKET := $(shell [ ${ICU_MAJOR} -ge 5 -o \( ${ICU_MAJOR}
-eq 4 -a ${ICU_MINOR} -ge 4 \) ] && echo YES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sw jvmfwk/distributions jvmfwk/plugins ooo_custom_images/classic
default_images/sw/res/point.png |binary
default_images/sw/res/point_h.png |binary
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |6 +-
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |7 ++-
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml|6 +-
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml|6 +-
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |4 +++-
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |1 +
ooo_custom_images/classic/classic_images.tar.gz |binary
9 files changed, 25 insertions(+), 5 deletions(-)
New commits:
commit ff76cb4e0f3f8d0164570638742f140aa5b728ef
Author: Damjan Jovanovic
AuthorDate: Sat Jul 27 15:50:09 2019 +
Commit: Damjan Jovanovic
CommitDate: Sat Jul 27 15:50:09 2019 +
Add support for the AdoptOpenJDK Java distribution
(https://adoptopenjdk.net/).
Closes #i128157# Add support for AdoptOpenJDK JVM's.
Patch by: me
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index cbbc8d21c08d..80dd762cabb6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -23,7 +23,7 @@
http://openoffice.org/2004/java/framework/1.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
- 2012-10-06
+ 2019-07-27
@@ -44,6 +44,9 @@
1.5.0
+
+1.8.0
+
@@ -53,5 +56,6 @@
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
+ vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 63eb024a9a5e..5bc909c3f265 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,7 +23,7 @@
http://openoffice.org/2004/java/framework/1.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
- 2013-01-01
+ 2019-07-27
@@ -35,10 +35,15 @@
1.7.0
+
+1.8.0
+
+
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
+ vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index f1f5fa284911..94268509cae6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -23,7 +23,7 @@
http://openoffice.org/2004/java/framework/1.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
- 2011-01-07
+ 2019-07-27
@@ -32,10 +32,14 @@
1.5.0
+
+1.8.0
+
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
+ vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index a0257444ae34..92c6d1988c87 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -23,7 +23,7 @@
http://openoffice.org/2004/java/framework/1.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
- 2012-10-06
+ 2019-07-27
@@ -35,11 +35,15 @@
1.5.0
+
+1.8.0
+
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
+ vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 5c0f0164675d..24b1835695e2 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -120,6 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software
Foundation, Inc."));
rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD
Foundation"));
+rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("AdoptOpenJDK"));
if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
|| sVendor1.equals(pInfo->sVendor) == sal_Tru
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |4 +++- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |6 -- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 1eae11e288b879e4b770fe714c3229fd3bd7d8ec Author: Damjan Jovanovic AuthorDate: Sat Jul 27 19:55:19 2019 + Commit: Damjan Jovanovic CommitDate: Sat Jul 27 19:55:19 2019 + Fix detection of Java versions > 1.8 Patch by: me diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 84dfedfaedd9..46456bc2be2b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems +"/lib/server/libjvm.so", // > 1.8 "/bin/classic/libjvm.so", // fallback for older for IBM Java "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java #endif @@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", -"/lib/" JFW_PLUGIN_ARCH +"/lib/" JFW_PLUGIN_ARCH, +"/lib" // > 1.8 #endif }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 2f636561ad07..a0ecb2508864 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", -"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" +"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", +"/lib/server/libjvm.so" // > 1.8 #endif }; *size = sizeof(ar) / sizeof (char*); @@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/native_threads", -"/lib/" JFW_PLUGIN_ARCH +"/lib/" JFW_PLUGIN_ARCH, +"/lib" // > 1.8 }; *size = sizeof(ar) / sizeof (char*); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'distro/collabora/libreoffice-4.0.6.2'
New branch 'distro/collabora/libreoffice-4.0.6.2' available with the following commits: commit 36f1060e3c5be0946cd1bc811b84cc542fafe70b Author: Damjan Jovanovic Date: Sun Aug 20 06:22:29 2017 + i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably In the Java UNO bridge, UnoRuntime.generateOid() generated the object-specific part of the OID using java.lang.Object.hashCode(), which is only 32 bits long, and is commonly overriden and could thus return values from an even smaller range, so OID collisions were quite likely. This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the object-specific part of the OID, and store these in an object => oid java.util.WeakHashMap, making OID collisions almost impossible. Patch by: me Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at googlemail dot com) (cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118) Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95 Reviewed-on: https://gerrit.libreoffice.org/41576 Reviewed-by: Stephan Bergmann Reviewed-by: Noel Grandin Tested-by: Jenkins commit 4a92919c5b1f94ccc58acc01ad3fb40961fce7ad Author: Miklos Vajna Date: Mon Jun 6 12:34:08 2016 +0200 SwXDispatchProviderInterceptor: implement frame::XInterceptorInfo With this, framework::InterceptionHelper can make a better decision what interceptor to call: it can avoid calling SwXDispatchProviderInterceptor when the sw code would just call the previous interceptor anyway. Reviewed-on: https://gerrit.libreoffice.org/25961 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit b0d819ac5667a07f629f2acb5d3c542fa76d348b) Conflicts: sw/source/uibase/inc/unodispatch.hxx sw/source/uibase/uno/unodispatch.cxx Change-Id: I92897f2c8baa264dc9ccbc11b63f415da30a910d commit b99c91d1d78915fea57ba6b8c905e68ae1ad4632 Author: Thorsten Behrens Date: Fri May 20 16:48:00 2016 +0200 framework: last dispatchInterceptor gets asked first Align implementation with API contract as spelled out in offapi/com/sun/star/frame/XDispatchProviderInterception.idl - no idea why this change happenend in 2003: Date: Fri Apr 4 16:16:05 2003 + INTEGRATION: CWS fwk01 (1.1.72); FILE MERGED 2003/04/01 12:40:09 as 1.1.72.1: #107642# change order of used interception objects At any rate, with this change extensions actually get a chance to see dispatch requests first, and process/ignore at will. Change-Id: I58876150ee6d67e592f41b3e82a9ffc314e091a3 Reviewed-on: https://gerrit.libreoffice.org/25215 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 08cf2fd01064306eef7fdbb5b62320947c4d1089) commit aa7f4295c0d428f79149228c3b4d38d6212d3906 Author: Thorsten Behrens Date: Wed Mar 2 15:28:36 2016 +0100 framework: avoid excessive queryDispatch calls Make better use of the css::frame::XInterceptorInfo interface, to avoid calling queryDispatch() pointlessly on interfaces that have explicitely opted out. Since that already broadcasts which urls we're interested in - so just don't bother calling entries who are not matching. Reviewed-on: https://gerrit.libreoffice.org/25214 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 27b6cdb5ab5af33dbba561923c8db81e144c88b9) Conflicts: framework/source/dispatch/interceptionhelper.cxx Change-Id: Id5e780568fd60c38f4cee4ee800d747d65a31dae commit b910152f23678e83b6f6ac0b2ad6728de9ebd92c Author: shubhamtibra Date: Sat Jan 16 21:50:24 2016 +0530 tdf#96949 Remove global static variable m_bPreferrFirstInterceptor and ... ... unused code Remove global static variable "m_bPreferrFirstInterceptor" which is always true, and remove the ifs where it is false. Reviewed-on: https://gerrit.libreoffice.org/21519 Reviewed-by: jan iversen Tested-by: jan iversen (cherry picked from commit 5d4f1f6f630d4382679087a4fb0da364c9c9692b) Conflicts: framework/inc/dispatch/interceptionhelper.hxx framework/source/dispatch/interceptionhelper.cxx Change-Id: I54dcea7a6010c825a66020ec3f7448bb32d120b8 commit 3e4efb6902141051374082458626b97e543b0053 Author: Miklos Vajna Date: Thu May 12 20:32:34 2016 +0200 framework: register DispatchDisabler service Change-Id: I72d9f8b00ba8b2e4e5dc70d7fd77e13ccf9d3bcc Reviewed-on: https://gerrit.libreoffice.org/24940 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit 1f041bf31e071611a15ffa1559d2f5df05a685f0) commit 333c2e3ae9c1184ecb2894cb280364a31571eeae Author: Michael Meeks Date: Thu Jan 7 19:24:41 2016 + framework: initial implementation of a disp
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - ridljar/com
ridljar/com/sun/star/uno/UnoRuntime.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit a9a87a6cc7005af937dd72aa388253b3858cdb3b
Author: Damjan Jovanovic
AuthorDate: Sun Aug 20 06:22:29 2017 +
Commit: Andras Timar
CommitDate: Wed Dec 1 15:17:32 2021 +0100
i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably
In the Java UNO bridge, UnoRuntime.generateOid() generated the
object-specific part of the OID using java.lang.Object.hashCode(),
which is only 32 bits long, and is commonly overriden and could thus
return values from an even smaller range, so OID collisions were quite
likely.
This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
object-specific part of the OID, and store these in an object => oid
java.util.WeakHashMap, making OID collisions almost impossible.
Patch by: me
Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
googlemail dot com)
(cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118)
Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95
Reviewed-on: https://gerrit.libreoffice.org/41576
Reviewed-by: Stephan Bergmann
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java
b/ridljar/com/sun/star/uno/UnoRuntime.java
index a2fb84848da4..0d3ae0b01d48 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.UUID;
+import java.util.WeakHashMap;
import com.sun.star.lib.uno.typedesc.TypeDescription;
import com.sun.star.lib.util.WeakMap;
@@ -104,7 +106,16 @@ public class UnoRuntime {
if (object instanceof IQueryInterface) {
oid = ((IQueryInterface) object).getOid();
}
-return oid == null ? object.hashCode() + oidSuffix : oid;
+if (oid == null) {
+synchronized (oidMap) {
+ oid = oidMap.get(object);
+ if (oid == null) {
+ oid = UUID.randomUUID().toString() + oidSuffix;
+ oidMap.put(object, oid);
+ }
+}
+}
+return oid;
}
/**
@@ -673,6 +684,7 @@ public class UnoRuntime {
private final IBridge bridge;
}
+private static final WeakHashMap oidMap = new
WeakHashMap();
private static final String uniqueKeyHostPrefix
= Integer.toString(new Object().hashCode(), 16) + ":";
private static final Object uniqueKeyLock = new Object();
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - include/svtools svtools/source
include/svtools/htmlkywd.hxx |1 +
svtools/source/svhtml/htmlkywd.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 1b9042f763a439c5aa0f1088ac86cfc203ccc3b2
Author: Damjan Jovanovic
AuthorDate: Tue Jan 3 08:41:13 2023 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Mar 20 17:39:41 2023 +
tdf#154273: Add the "" entity definition to our HTML parser...
... so that we can correctly read it and convert it a "'",
but when writing to HTML write out the "'" directly for now.
Fixes: https://bz.apache.org/ooo/show_bug.cgi?id=80657
Patch by: me
Cherry-picked from
https://github.com/apache/openoffice/commit/3304210c5c53f441cdb2c462fbbf6d8351380b01
"Add the "" entity definition to our HTML parser, so that we can…"
Change-Id: I10d07af5f49d2432d99a79318d9d95b0bc976637
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149150
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
(cherry picked from commit 28341f0b107b7bcd1377cec68c90eee9c4f27e1c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149104
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 9a84cddd37bf..cdcee168acba 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -150,6 +150,7 @@
#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
+#define OOO_STRING_SVTOOLS_HTML_C_apos "apos"
#define OOO_STRING_SVTOOLS_HTML_C_quot "quot"
#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute"
#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave"
diff --git a/svtools/source/svhtml/htmlkywd.cxx
b/svtools/source/svhtml/htmlkywd.cxx
index 584322fac8bc..5f81b3e3ca30 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -203,6 +203,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = {
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_lt), 60},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_gt), 62},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_amp),38},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_apos),39},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_quot), 34},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave),192},
[Libreoffice-commits] core.git: 2 commits - ridljar/com sal/osl
ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java |
23 +++---
sal/osl/unx/process.cxx|
5 ++
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f4d147ef956de834a7402bea88a1aec296c38ef7
Author: Damjan Jovanovic
AuthorDate: Mon Feb 27 20:19:39 2023 +
Commit: Caolán McNamara
CommitDate: Tue Feb 28 11:12:06 2023 +
InputStreamToXInputStreamAdapter.readBytes() should read...
until the buffer is full, or the file ends. It shouldn't care about
available().
(cherry-picked from f04910427d25ede98b84b90df7cc5a12d1adc695)
Change-Id: I4ad17c614ba336ff21883248715861f6af1fbc2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147934
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git
a/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
b/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index d547b1e7ce17..dd634e771370 100644
--- a/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -79,29 +79,24 @@ public final class InputStreamToXInputStreamAdapter
implements XInputStream {
{
try {
long bytesRead;
+int totalBytesRead = 0;
if (b[0] == null || b[0].length < len) {
b[0] = new byte[len];
}
-if (len >iIn.available()) {
-bytesRead = iIn.read(b[0], 0, iIn.available());
-}
-else{
-bytesRead = iIn.read(b[0], 0, len);
-}
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
-if (bytesRead < b[0].length) {
-int outSize = bytesRead > 0 ? (int)bytesRead : 0;
-byte[] out = new byte[outSize];
-System.arraycopy(b[0], 0, out, 0, outSize);
-b[0] = out;
+while ((len > 0) && ((bytesRead = iIn.read(b[0], totalBytesRead,
len)) > 0)) {
+totalBytesRead += (int)bytesRead;
+len -= (int)bytesRead;
}
-if (bytesRead <= 0) {
-return 0;
+if (totalBytesRead < b[0].length) {
+byte[] out = new byte[totalBytesRead];
+System.arraycopy(b[0], 0, out, 0, totalBytesRead);
+b[0] = out;
}
-return ((int)bytesRead);
+return totalBytesRead;
} catch (IOException e) {
throw new com.sun.star.io.IOException("reader error", e);
}
commit 4f743219e85e61f622a8dadc028c144010eecd4d
Author: Caolán McNamara
AuthorDate: Mon Feb 27 20:49:08 2023 +
Commit: Caolán McNamara
CommitDate: Tue Feb 28 11:11:56 2023 +
cid#1521506 silence Thread deadlock
and
cid#1521510 Thread deadlock
annotation is getting a bit spamy
Change-Id: I3120562c0f7ca996f53d14965efe7af506be6d19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147935
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index f75534fdc311..7d6936265c0b 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -329,6 +329,7 @@ static void ChildStatusProc(void *pData)
else
pChild->m_status = -1;
+// coverity[lock_order : FALSE] - incorrect report of
lock order error
osl_setCondition(pChild->m_terminated);
}
@@ -731,8 +732,12 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier
Ident)
pProcImpl->m_status = pChild->m_status;
+// coverity[lock_order : FALSE] - incorrect report of lock order
error
if (osl_checkCondition(pChild->m_terminated))
+{
+// coverity[lock_order : FALSE] - incorrect report of lock
order error
osl_setCondition(pProcImpl->m_terminated);
+}
}
else
pProcImpl->m_pnext = nullptr;
[Libreoffice-commits] core.git: ridljar/com
ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java |
18 ++
1 file changed, 18 insertions(+)
New commits:
commit 618e8e30a21efea41b9a4e63219de20e38987f4a
Author: Damjan Jovanovic
AuthorDate: Mon Feb 27 20:15:20 2023 +
Commit: Caolán McNamara
CommitDate: Tue Feb 28 10:05:12 2023 +
Fix the java.lang.NullPointerException in readBytes() and readSomeBytes()...
methods in InputStreamToXInputStreamAdapter when called from the
inter-process UNO bridge.
XInputStream::readBytes() documents how the buffer is an "out" parameter,
and isn't passed
to the implementing end, which is why we get the buffer as a "byte[][] b"
and b[0] == null.
Its role is to box a byte[] array to be returned the client. Thus, allocate
the buffer if
it is missing or too small.
Additionally, virtually all other readBytes() and readSomeBytes()
implementations trim this
sequence to the actual number of bytes read. This presumably reduces the
inter-process
traffic, but some callers even rely on the sequence to be trimmed, eg.
main/sax/source/expatwrap/xml2utf.cxx. Thus trim our returned array too.
(cherry-picked from 6cb06142790376a2c58e6392182eb071420a4221)
Change-Id: I42eb209b68f7c13a34670d03c2ca61d76672385b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147933
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git
a/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
b/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index a81bb85b1c57..d547b1e7ce17 100644
--- a/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -79,6 +79,9 @@ public final class InputStreamToXInputStreamAdapter
implements XInputStream {
{
try {
long bytesRead;
+if (b[0] == null || b[0].length < len) {
+b[0] = new byte[len];
+}
if (len >iIn.available()) {
bytesRead = iIn.read(b[0], 0, iIn.available());
}
@@ -89,6 +92,12 @@ public final class InputStreamToXInputStreamAdapter
implements XInputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
+if (bytesRead < b[0].length) {
+int outSize = bytesRead > 0 ? (int)bytesRead : 0;
+byte[] out = new byte[outSize];
+System.arraycopy(b[0], 0, out, 0, outSize);
+b[0] = out;
+}
if (bytesRead <= 0) {
return 0;
}
@@ -103,6 +112,9 @@ public final class InputStreamToXInputStreamAdapter
implements XInputStream {
{
try {
long bytesRead;
+if (b[0] == null || b[0].length < len) {
+b[0] = new byte[len];
+}
if (len >iIn.available()) {
bytesRead = iIn.read(b[0], 0, iIn.available());
}
@@ -113,6 +125,12 @@ public final class InputStreamToXInputStreamAdapter
implements XInputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
+if (bytesRead < b[0].length) {
+int outSize = bytesRead > 0 ? (int)bytesRead : 0;
+byte[] out = new byte[outSize];
+System.arraycopy(b[0], 0, out, 0, outSize);
+b[0] = out;
+}
if (bytesRead <= 0) {
return 0;
}
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java | 12
+++---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit d0159892793860e53ddc068b4bdb707a521def19
Author: Damjan Jovanovic
AuthorDate: Sun Oct 16 18:31:15 2022 +0200
Commit: Xisco Fauli
CommitDate: Mon Mar 20 14:43:13 2023 +
Fix some errors in the scripting module's XInputStreamImpl:
- Check the loop termination in readBytes() properly: currently it
increments
totalBytesRead while also decrementing nBytesToRead, so when compared to
each other, the loop terminates when the buffer is half full. Only check
for nBytesToRead instead.
- Deal with the possibility of available() returning 0 in readSomeBytes().
Patch by: me
Cherry-picked from
https://github.com/apache/openoffice/commit/7e29bacc90c4b1b9788c3b71dfacd17daecde7a7
"Fix some errors in the scripting module's XInputStreamImpl:"
Change-Id: I951dc10565afa3519b0ddf98de559a7b585b1627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149156
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git
a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index 8320b6227cdb..3270d40d5bfb 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
@@ -41,11 +41,16 @@ public class XInputStreamImpl implements XInputStream {
try {
int bytesRead;
-while ((bytesRead = is.read(aData[ 0 ], totalBytesRead,
nBytesToRead)) > 0
- && (totalBytesRead < nBytesToRead)) {
+while (( nBytesToRead > 0 ) && (bytesRead = is.read(aData[ 0 ],
totalBytesRead, nBytesToRead)) > 0) {
totalBytesRead += bytesRead;
nBytesToRead -= bytesRead;
}
+if ( totalBytesRead < aData[ 0 ].length )
+{
+byte[] out = new byte[ totalBytesRead ];
+System.arraycopy( aData[ 0 ], 0, out, 0, totalBytesRead );
+aData[ 0 ] = out;
+}
} catch (IOException e) {
throw new com.sun.star.io.IOException(e);
} catch (IndexOutOfBoundsException aie) {
@@ -62,7 +67,8 @@ public class XInputStreamImpl implements XInputStream {
int bytesToRead = nMaxBytesToRead;
int availableBytes = available();
-if (availableBytes < nMaxBytesToRead) {
+if (0 < availableBytes && availableBytes < nMaxBytesToRead)
+{
bytesToRead = availableBytes;
}
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/htmlkywd.hxx |1 +
svtools/source/svhtml/htmlkywd.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 28341f0b107b7bcd1377cec68c90eee9c4f27e1c
Author: Damjan Jovanovic
AuthorDate: Tue Jan 3 08:41:13 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon Mar 20 14:45:17 2023 +
tdf#154273: Add the "" entity definition to our HTML parser...
... so that we can correctly read it and convert it a "'",
but when writing to HTML write out the "'" directly for now.
Fixes: https://bz.apache.org/ooo/show_bug.cgi?id=80657
Patch by: me
Cherry-picked from
https://github.com/apache/openoffice/commit/3304210c5c53f441cdb2c462fbbf6d8351380b01
"Add the "" entity definition to our HTML parser, so that we can…"
Change-Id: I10d07af5f49d2432d99a79318d9d95b0bc976637
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149150
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 9a84cddd37bf..cdcee168acba 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -150,6 +150,7 @@
#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
+#define OOO_STRING_SVTOOLS_HTML_C_apos "apos"
#define OOO_STRING_SVTOOLS_HTML_C_quot "quot"
#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute"
#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave"
diff --git a/svtools/source/svhtml/htmlkywd.cxx
b/svtools/source/svhtml/htmlkywd.cxx
index 584322fac8bc..5f81b3e3ca30 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -203,6 +203,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = {
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_lt), 60},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_gt), 62},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_amp),38},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_apos),39},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_quot), 34},
{std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave),192},
core.git: include/sot sfx2/source sot/source vcl/source
include/sot/formats.hxx |3 +-
sfx2/source/doc/sfxbasemodel.cxx | 47 ---
sot/source/base/exchange.cxx |1
vcl/source/treelist/transfer.cxx | 36 +
4 files changed, 77 insertions(+), 10 deletions(-)
New commits:
commit 6c04b8356c0764ba8ac51448eee5ff577b08d9e2
Author: Damjan Jovanovic
AuthorDate: Wed Feb 14 22:02:35 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 15 22:09:34 2024 +0100
i#112829: offer svg as clipboard format as well
When copying charts, shapes, etc. out of LibreOffice, export them to
the clipboard in the (lossless) SVG graphics format as well.
This can be pasted into GIMP, Inkscape, and other apps, unlike our
current WMF/EMF clipboard formats which use private MIME types that
nothing supports.
(cherry picked from commit 61aee323790d0a1ed0745ee5a84b8885bcd0a559)
Change-Id: Ia32be448a096154bb092d49f372148c6b2263f35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163412
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index 12727ffb34c9..fbfa3754bd82 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -175,8 +175,9 @@ enum class SotClipboardFormatId : sal_uInt32
RICHTEXT = 145,
STRING_TSVC= 146,
PDF= 147,
+SVG= 148,
// the point at which we start allocating "runtime" format IDs
-USER_END = PDF
+USER_END = SVG
};
/** Make it easier to iterate over format IDs */
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5de773ac01e2..3d969f223fc1 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2229,6 +2229,28 @@ Any SAL_CALL SfxBaseModel::getTransferData( const
datatransfer::DataFlavor& aFla
else
throw datatransfer::UnsupportedFlavorException();
}
+else if ( aFlavor.MimeType == "image/svg+xml" )
+{
+if ( aFlavor.DataType != cppu::UnoType>::get() )
+throw datatransfer::UnsupportedFlavorException();
+
+std::shared_ptr xMetaFile =
+m_pData->m_pObjectShell->GetPreviewMetaFile( true );
+
+if (xMetaFile)
+{
+std::unique_ptr xStream(
+GraphicHelper::getFormatStrFromGDI_Impl(
+xMetaFile.get(), ConvertDataFormat::SVG ) );
+
+if (xStream)
+{
+xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
+aAny <<= Sequence< sal_Int8 >( static_cast< const
sal_Int8* >( xStream->GetData() ),
+xStream->TellEnd() );
+}
+}
+}
else if ( aFlavor.MimeType ==
"application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )
{
if ( aFlavor.DataType != cppu::UnoType>::get() )
@@ -2288,7 +2310,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL
SfxBaseModel::getTransferDataFlavo
{
SfxModelGuard aGuard( *this );
-const sal_Int32 nSuppFlavors =
GraphicHelper::supportsMetaFileHandle_Impl() ? 10 : 8;
+const sal_Int32 nSuppFlavors =
GraphicHelper::supportsMetaFileHandle_Impl() ? 11 : 9;
Sequence< datatransfer::DataFlavor > aFlavorSeq( nSuppFlavors );
auto pFlavorSeq = aFlavorSeq.getArray();
@@ -2331,17 +2353,21 @@ Sequence< datatransfer::DataFlavor > SAL_CALL
SfxBaseModel::getTransferDataFlavo
pFlavorSeq[7].HumanPresentableName = "PNG";
pFlavorSeq[7].DataType = cppu::UnoType>::get();
-if ( nSuppFlavors == 10 )
+pFlavorSeq[8].MimeType = "image/svg+xml";
+pFlavorSeq[8].HumanPresentableName = "SVG";
+pFlavorSeq[8].DataType = cppu::UnoType>::get();
+
+if ( nSuppFlavors == 11 )
{
-pFlavorSeq[8].MimeType =
+pFlavorSeq[9].MimeType =
"application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-pFlavorSeq[8].HumanPresentableName = "Enhanced Windows MetaFile";
-pFlavorSeq[8].DataType = cppu::UnoType::get();
+pFlavorSeq[9].HumanPresentableName = "Enhanced Windows MetaFile";
+pFlavorSeq[9].DataType = cppu::UnoType::get();
-pFlavorSeq[9].MimeType =
+pFlavorSeq[10].MimeType =
"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
-pFlavorSeq[9].HumanPresentableName = "Windows MetaFile";
-pFlavorSeq[9].DataType = cppu::UnoType::get();
+pFlavorSeq[10].HumanPresentableName = "Windows MetaFile";
+pFlavorSeq[10].D
