[Libreoffice-commits] core.git: 7 commits - external/libxml2 RepositoryExternal.mk Repository.mk scp2/source sfx2/README
Michael Stahl
mstahl at redhat.com
Fri Mar 14 04:34:44 PDT 2014
Repository.mk | 4
RepositoryExternal.mk | 26 ++++
external/libxml2/ExternalPackage_xml2.mk | 4
external/libxml2/ExternalPackage_xml2_win32.mk | 26 ++++
external/libxml2/Module_libxml2.mk | 1
scp2/source/ooo/common_brand.scp | 19 ---
scp2/source/ooo/file_library_ooo.scp | 141 -------------------------
scp2/source/ooo/module_hidden_ooo.scp | 25 ----
scp2/source/ooo/ure.scp | 20 ---
sfx2/README | 3
10 files changed, 61 insertions(+), 208 deletions(-)
New commits:
commit 64ea9944cfc441504915da37f6b2dff7a394d797
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Mar 14 11:48:24 2014 +0100
scp2: move libxml2 to AutoInstall
Change-Id: I62f2f654ac661ebf266b7b5cf70728a616c9b50f
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4553be3..39bed26 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -868,6 +868,14 @@ gb_ExternalProject__use_libxml2:=
else # !SYSTEM_LIBXML
+$(eval $(call gb_Helper_register_packages_for_install,ure,\
+ xml2 \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ xml2_win32 \
+))
+
define gb_LinkTarget__use_libxml2
$(call gb_LinkTarget_use_package,$(1),xml2)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index e25a7f8..a0bf5eb 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -17,12 +17,8 @@ $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2.
else ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
else # COM=MSC
$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
-# duplicate copy next to executables due to idiotic Win32 DLL search order
-# see 5a5dab5167d136c315e81448ea8eca59e60067da
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
endif
else # OS!=WNT
$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1))
diff --git a/external/libxml2/ExternalPackage_xml2_win32.mk b/external/libxml2/ExternalPackage_xml2_win32.mk
new file mode 100644
index 0000000..c97fd89
--- /dev/null
+++ b/external/libxml2/ExternalPackage_xml2_win32.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,xml2_win32,xml2))
+
+$(eval $(call gb_ExternalPackage_use_external_project,xml2_win32,xml2))
+
+# duplicate copy next to executables due to stupid Win32 DLL search order
+# where a libxml2.dll in C:\Windows is loaded before one in URE lib dir
+# see 5a5dab5167d136c315e81448ea8eca59e60067da
+
+ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
+$(eval $(call gb_ExternalPackage_add_file,xml2_win32,$(LIBO_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
+else # COM=MSC
+$(eval $(call gb_ExternalPackage_add_file,xml2_win32,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
+endif
+endif # OS=WNT
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/Module_libxml2.mk b/external/libxml2/Module_libxml2.mk
index f6bca3f..9efb17c 100644
--- a/external/libxml2/Module_libxml2.mk
+++ b/external/libxml2/Module_libxml2.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,libxml2))
$(eval $(call gb_Module_add_targets,libxml2,\
ExternalPackage_xml2 \
+ ExternalPackage_xml2_win32 \
ExternalProject_xml2 \
UnpackedTarball_xml2 \
))
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2498822..e731d8f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -61,7 +61,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Unopkgcom,
gid_Brand_File_Bin_Unopkgexe,
gid_Brand_File_Bin_Unopkg,
- gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAboutShell,
gid_Brand_File_Bmp_IntroAboutShell_custom,
gid_Brand_File_Desktophelper_Txt,
@@ -616,24 +615,6 @@ File gid_Brand_File_Bin_Unopkg
Name = "unopkg.bin";
End
-// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
-// from a Windows system directory instead of the one from the URE; to avoid
-// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
-// the OOo executables (where it takes precedence even over DLLs from the
-// Windows system directory):
-#if defined WNT && !defined SYSTEM_LIBXML
-File gid_Brand_File_Bin_Libxml2
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
-#if defined _gcc3
- Name = SCP2_URE_DL_NORMAL("libxml2-2");
-#else
- Name = SCP2_URE_DL_NORMAL("libxml2");
-#endif
- Styles = (PACKED);
-End
-#endif
-
#if defined ENABLE_NPAPI_INTO_BROWSER
File gid_Brand_File_Lib_Npsoplugin
BIN_FILE_BODY;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 00263a9..fb5aaba 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -370,25 +370,6 @@ End
#endif
-#if !defined SYSTEM_LIBXML
-File gid_File_Dl_Libxml2
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined WNT
-#if defined _gcc3
- Name = SCP2_URE_DL_NORMAL("libxml2-2");
-#else
- Name = SCP2_URE_DL_NORMAL("libxml2");
-#endif
-#elif defined MACOSX
- Name = SCP2_URE_DL_NORMAL("xml2.2");
-#else
- Name = SCP2_URE_DL_VER("xml2", "2");
-#endif
- Styles = (PACKED);
-End
-#endif
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Libxml2
BIN_FILE_BODY;
@@ -488,7 +469,6 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
gid_Unixlink_File_Dl_Rmcxt,
- gid_File_Dl_Libxml2,
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
gid_File_Dl_Uwinapi,
commit e759269e373fa02d3e8566d1edc9fb9526de6640
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Mar 14 11:23:52 2014 +0100
scp2: move ICU to AutoInstall
Change-Id: Ia9beb721301146fd8ec1d6c141189f580dd20d45
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 54d4cb0..4553be3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1337,6 +1337,10 @@ endef
else # !SYSTEM_ICU
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+ icu \
+))
+
ifeq ($(OS)$(DISABLE_DYNLOADING),ANDROID)
gb_ICU_suffix:=lo
else
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6703125..cc45c12 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -110,49 +110,6 @@ End
#endif
#endif
-#ifndef SYSTEM_ICU
-
-File gid_File_Lib_Icudata
- PACKED_LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR));
- #else
- #ifdef MSVC_PKG_DEBUG_RUNTIME
- Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll));
- #else
- Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll));
- #endif // MSVC_PKG_DEBUG_RUNTIME
- #endif
-End
-
-File gid_File_Lib_Icui18n
- PACKED_LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR));
- #else
- #ifdef MSVC_PKG_DEBUG_RUNTIME
- Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll));
- #else
- Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll));
- #endif // MSVC_PKG_DEBUG_RUNTIME
- #endif
-End
-
-File gid_File_Lib_Icuuc
- PACKED_LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR));
- #else
- #ifdef MSVC_PKG_DEBUG_RUNTIME
- Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll));
- #else
- Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll));
- #endif // MSVC_PKG_DEBUG_RUNTIME
- #endif
-End
-
-#endif
-
#if defined(MACOSX)
File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 40a6e8d..fad9607 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -156,9 +156,6 @@ Module gid_Module_Root_Files_5
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_Unixlink_File_Lib_Curl,
- gid_File_Lib_Icudata,
- gid_File_Lib_Icui18n,
- gid_File_Lib_Icuuc,
gid_File_Lib_Recentfile,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
commit ffae67cba85e9737927d03b525f3108df9b4c526
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Mar 13 19:51:19 2014 +0100
scp2: move NSS to AutoInstall
Change-Id: Ibb8e8740a3193be8eace206eedc659ed628e9c6b
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3455170..54d4cb0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3003,6 +3003,10 @@ endef
else # !SYSTEM_NSS
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+ nss \
+))
+
define gb_LinkTarget__use_nss3
$(call gb_LinkTarget_use_package,$(1),nss)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a6d80c1..6703125 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -166,29 +166,6 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
//we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
-#ifndef SYSTEM_NSS
-SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi)
-SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4)
-SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4)
-SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
-SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
-#ifdef WNT
-SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
-#else
-#if !defined(MACOSX)
-File gid_File_Lib_Sqlite3
- Name = SPECIAL_NAME(sqlite3);
- PACKED_LIB_FILE_BODY;
-End
-#endif //!defined(MACOSX)
-#endif //WNT
-SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
-#endif //SYSTEM_NSS
File gid_File_Lib_XSec_XmlSec
PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c937482..40a6e8d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -165,18 +165,6 @@ Module gid_Module_Root_Files_5
gid_Unixlink_File_Lib_Raptor,
gid_Unixlink_File_Lib_Rasqal,
gid_Unixlink_File_Lib_Rdf,
- gid_File_Lib_Freebl3,
- gid_File_Lib_Nss3,
- gid_File_Lib_Nspr,
- gid_File_Lib_Nssdbm3,
- gid_File_Lib_Nssutil3,
- gid_File_Lib_Nssckbi,
- gid_File_Lib_Plc4,
- gid_File_Lib_Plds4,
- gid_File_Lib_Softokn3,
- gid_File_Lib_Smime3,
- gid_File_Lib_Sqlite3,
- gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile,
gid_File_Lib_Neon,
gid_Unixlink_File_Lib_Xslt,
commit 6cf0753c99205b2b6e5eb458224199418ab9d9fa
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Mar 13 19:43:27 2014 +0100
scp2: move libxmlsec to AutoInstall
Change-Id: I3a1798c5b2a2d7117d0d5f761f19ab627ba6606a
diff --git a/Repository.mk b/Repository.mk
index a97f652..ab60094 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -705,6 +705,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
))
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ xmlsec \
+))
+
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 046741c..a6d80c1 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -201,37 +201,6 @@ End
#endif
-#ifdef WNT
-File gid_File_Lib_LibXMLSec_xmlseccore
- PACKED_LIB_FILE_BODY;
- #ifdef _gcc3
- Name = "libxmlsec1.dll";
- #else
- Name = "libxmlsec.dll";
- #endif
-End
-
-#ifdef CROSS_COMPILING
-File gid_File_Lib_LibXMLSec_xmlsecnss
- PACKED_LIB_FILE_BODY;
- #ifdef _gcc3
- Name = "libxmlsec1-nss.dll";
- #else
- Name = "libxmlsec-nss.dll";
- #endif
-End
-#else
-File gid_File_Lib_LibXMLSec_xmlsecmscrypto
- PACKED_LIB_FILE_BODY;
- #ifdef _gcc3
- Name = "libxmlsec1-mscrypto.dll";
- #else
- Name = "libxmlsec-mscrypto.dll";
- #endif
-End
-#endif
-#endif
-
#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 49d883f..c937482 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -181,9 +181,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Neon,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
- gid_File_Lib_LibXMLSec_xmlsecnss,
- gid_File_Lib_LibXMLSec_xmlseccore,
- gid_File_Lib_LibXMLSec_xmlsecmscrypto,
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_I18n,
gid_File_Lib_Accessbridge,
commit f921e2609a44b983866fd07f2240fa4dd0f23dfc
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Mar 13 19:36:48 2014 +0100
scp2: move openssl to AutoInstall
Change-Id: Iab04734140feb293e3d975234da2f727fa58e754
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8958286..3455170 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1462,6 +1462,10 @@ endef
else # !SYSTEM_OPENSSL
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+ openssl \
+))
+
define gb_ExternalProject__use_openssl
$(call gb_ExternalProject_use_package,$(1),openssl)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 7c6aa29..046741c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -232,25 +232,6 @@ End
#endif
#endif
-#ifndef SYSTEM_OPENSSL
-File gid_File_Lib_Openssl
- PACKED_LIB_FILE_BODY;
- #ifdef WNT
- Name = "ssleay32.dll";
- #endif
-End
-#endif
-
-#ifndef SYSTEM_OPENSSL
-File gid_File_Lib_Crypto
- PACKED_LIB_FILE_BODY;
-
- #ifdef WNT
- Name = "libeay32.dll";
- #endif
-End
-#endif
-
#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 9d6c595..49d883f 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -155,12 +155,10 @@ Module gid_Module_Root_Files_5
Sortkey = "1500";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Lib_Crypto,
- gid_Unixlink_File_Lib_Curl,
+ Files = (gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
gid_File_Lib_Icuuc,
- gid_File_Lib_Openssl,
gid_File_Lib_Recentfile,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
commit 5ae30d3a0610155570d5e18323dd2031c1d79120
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Mar 13 19:32:13 2014 +0100
scp2: move redland libraries to AutoInstall
Change-Id: I464acbd191aeb25ab4b53d0f28378ee36f7893db
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a4daea7..8958286 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1144,6 +1144,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
rasqal \
rdf \
))
+else
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+ raptor \
+ rasqal \
+ redland \
+))
endif
define gb_LinkTarget__use_librdf
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5aace43..7c6aa29 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -274,28 +274,3 @@ File gid_File_Moz_Msvc80crt_Manifest
End
#endif
-#ifndef SYSTEM_REDLAND
-#ifndef WNT
-File gid_File_Lib_Raptor
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "raptor.filelist";
-End
-
-File gid_File_Lib_Rasqal
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "rasqal.filelist";
-End
-
-File gid_File_Lib_Rdf
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "redland.filelist";
-End
-#endif // WNT
-#endif // SYSTEM_REDLAND
-
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 0daac7f..9d6c595 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -164,11 +164,8 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Recentfile,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- gid_File_Lib_Raptor,
gid_Unixlink_File_Lib_Raptor,
- gid_File_Lib_Rasqal,
gid_Unixlink_File_Lib_Rasqal,
- gid_File_Lib_Rdf,
gid_Unixlink_File_Lib_Rdf,
gid_File_Lib_Freebl3,
gid_File_Lib_Nss3,
commit 6c5dbe563e923e6ff95bbf7dcbddd1d3c00c8be8
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Mar 13 13:26:42 2014 +0100
sfx2: add link to SFX2 dispatch documentation on OOo Wiki
Change-Id: I628fd32c035443f0bdb90007f38151c41b1b5c84
diff --git a/sfx2/README b/sfx2/README
index 508d979..19d06f2 100644
--- a/sfx2/README
+++ b/sfx2/README
@@ -11,6 +11,9 @@ The SFX framework is based on dispatching slots identified by integers
involved that generates C++ slot headers from SDI files in modules' sdi/
subdirectory.
+Documentation about SFX dispatch, SDI etc.:
+https://wiki.openoffice.org/wiki/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2
+
Document load/save code is maintained in [git:sfx2/source/doc/docfile.cxx]
SfxMedium class, which handles all the twisty load and save corner cases.
More information about the Libreoffice-commits
mailing list