idl/source/objects/types.cxx | 4 +---
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 --
starmath/inc/mathml/xparsmlbase.hxx | 8 ++++----
starmath/source/mathml/export.cxx | 2 +-
starmath/source/mathml/import.cxx | 4 ++--
starmath/source/mathml/mathmlexport.cxx | 2 +-
starmath/source/mathml/mathmlimport.cxx | 4 ++--
starmath/source/mathml/xparsmlbase.cxx | 17 ++++-------------
8 files changed, 15 insertions(+), 28 deletions(-)
New commits:
commit 44a819a466fb553ff5dec97b258144fa75bbe7fd
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Mar 12 17:42:17 2024 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 12 20:39:20 2024 +0100
Revert "add sm to --enable-mergelibs=more"
This reverts commit 87d3f768f3ecded1e1392442181edb287aed9e2e.
The unit test at
starmath/CppunitTest_starmath_qa_cppunit.mk
is doing
$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\
sm \
))
which it is using to access to all the internal functions of starmath.
Unfortunately that linking trick is just not compatible with the mergelib
linking.
Change-Id: Ie3c81a0eeea5bed192de18981463497f251531a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 3228e1cce378..1089e929043c 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -249,9 +249,7 @@ void SvMetaType::WriteSfxItem(
// write the implementation part
rOutStm.WriteOString( "#ifdef SFX_TYPEMAP" ) << endl;
- rOutStm.WriteOString( "#if defined(_WIN32)" ) << endl;
- rOutStm.WriteOString( "__declspec(selectany)" ) << endl;
- rOutStm.WriteOString( "#else" ) << endl;
+ rOutStm.WriteOString( "#if !defined(_WIN32) &&
(defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) ||
defined(EMSCRIPTEN) || defined(LINUX)))" ) << endl;
rOutStm.WriteOString( "__attribute__((__weak__))" ) << endl;
rOutStm.WriteOString( "#endif" ) << endl;
rOutStm.WriteOString( aTypeName ).WriteOString( aVarName )
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 5c4db5957080..2c2e59479465 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -180,8 +180,6 @@ gb_MERGE_LIBRARY_LIST += \
sdbc2 \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
slideshow \
- sm \
- smd \
$(if $(filter WNT,$(OS)), \
smplmail \
) \
diff --git a/starmath/inc/mathml/xparsmlbase.hxx
b/starmath/inc/mathml/xparsmlbase.hxx
index 5c06482396ef..6c645a55e36c 100644
--- a/starmath/inc/mathml/xparsmlbase.hxx
+++ b/starmath/inc/mathml/xparsmlbase.hxx
@@ -39,15 +39,15 @@ constexpr sal_Int32 STARMATH_MATHMLHTML_ENTITY_NUMBER =
2125;
* Entity names for mathml. Example: &infin -> \u221E;
* These ones are to be used on import.
*/
-const css::uno::Sequence<::css::beans::Pair<::rtl::OUString, ::rtl::OUString>>&
-getCustomMathmlHtmlEntities();
+const extern ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString,
::rtl::OUString>>
+ icustomMathmlHtmlEntities;
/**
* Entity names for mathml. Example: "\u221E"; -> ∞
* These ones are to be used on file export.
*/
-const css::uno::Sequence<::css::beans::Pair<::rtl::OUString, ::rtl::OUString>>&
-getCustomMathmlHtmlEntitiesExport();
+const extern ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString,
::rtl::OUString>>
+ icustomMathmlHtmlEntitiesExport;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/mathml/export.cxx
b/starmath/source/mathml/export.cxx
index 001a31434eaf..60328c89dabf 100644
--- a/starmath/source/mathml/export.cxx
+++ b/starmath/source/mathml/export.cxx
@@ -299,7 +299,7 @@ bool SmMLExportWrapper::WriteThroughComponentOS(const
Reference<io::XOutputStrea
// connect XML writer to output stream
xSaxWriter->setOutputStream(xOutputStream);
if (m_bUseHTMLMLEntities)
-
xSaxWriter->setCustomEntityNames(starmathdatabase::getCustomMathmlHtmlEntitiesExport());
+
xSaxWriter->setCustomEntityNames(starmathdatabase::icustomMathmlHtmlEntitiesExport);
// prepare arguments (prepend doc handler to given arguments)
Sequence<Any> aArgs{ Any(xSaxWriter), Any(rPropSet) };
diff --git a/starmath/source/mathml/import.cxx
b/starmath/source/mathml/import.cxx
index ba1f59fa74f9..d857e56930d6 100644
--- a/starmath/source/mathml/import.cxx
+++ b/starmath/source/mathml/import.cxx
@@ -390,14 +390,14 @@ ErrCode SmMLImportWrapper::ReadThroughComponentIS(
Reference<css::xml::sax::XFastDocumentHandler>
xFastDocHandler(xFilter, UNO_QUERY);
if (xFastParser)
{
-
xFastParser->setCustomEntityNames(starmathdatabase::getCustomMathmlHtmlEntities());
+
xFastParser->setCustomEntityNames(starmathdatabase::icustomMathmlHtmlEntities);
xFastParser->parseStream(aParserInput);
}
else if (xFastDocHandler)
{
Reference<css::xml::sax::XFastParser> xParser
= css::xml::sax::FastParser::create(rxContext);
-
xParser->setCustomEntityNames(starmathdatabase::getCustomMathmlHtmlEntities());
+
xParser->setCustomEntityNames(starmathdatabase::icustomMathmlHtmlEntities);
xParser->setFastDocumentHandler(xFastDocHandler);
xParser->parseStream(aParserInput);
}
diff --git a/starmath/source/mathml/mathmlexport.cxx
b/starmath/source/mathml/mathmlexport.cxx
index 2f0a6f40f2b2..1c18e716e7d6 100644
--- a/starmath/source/mathml/mathmlexport.cxx
+++ b/starmath/source/mathml/mathmlexport.cxx
@@ -234,7 +234,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(const
Reference<io::XOutputStream
// connect XML writer to output stream
xSaxWriter->setOutputStream(xOutputStream);
if (m_bUseHTMLMLEntities)
-
xSaxWriter->setCustomEntityNames(starmathdatabase::getCustomMathmlHtmlEntitiesExport());
+
xSaxWriter->setCustomEntityNames(starmathdatabase::icustomMathmlHtmlEntitiesExport);
// prepare arguments (prepend doc handler to given arguments)
Sequence<Any> aArgs{ Any(xSaxWriter), Any(rPropSet) };
diff --git a/starmath/source/mathml/mathmlimport.cxx
b/starmath/source/mathml/mathmlimport.cxx
index d93e31a14e60..7bc3e5b913e3 100644
--- a/starmath/source/mathml/mathmlimport.cxx
+++ b/starmath/source/mathml/mathmlimport.cxx
@@ -264,7 +264,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(const
Reference<io::XInputStrea
if (xFastParser)
{
if (bUseHTMLMLEntities)
-
xFastParser->setCustomEntityNames(starmathdatabase::getCustomMathmlHtmlEntities());
+
xFastParser->setCustomEntityNames(starmathdatabase::icustomMathmlHtmlEntities);
xFastParser->parseStream(aParserInput);
}
else if (xFastDocHandler)
@@ -272,7 +272,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(const
Reference<io::XInputStrea
Reference<css::xml::sax::XFastParser> xParser
= css::xml::sax::FastParser::create(rxContext);
if (bUseHTMLMLEntities)
-
xParser->setCustomEntityNames(starmathdatabase::getCustomMathmlHtmlEntities());
+
xParser->setCustomEntityNames(starmathdatabase::icustomMathmlHtmlEntities);
xParser->setFastDocumentHandler(xFastDocHandler);
xParser->parseStream(aParserInput);
}
diff --git a/starmath/source/mathml/xparsmlbase.cxx
b/starmath/source/mathml/xparsmlbase.cxx
index 418126c68b23..ccfcf0049e77 100644
--- a/starmath/source/mathml/xparsmlbase.cxx
+++ b/starmath/source/mathml/xparsmlbase.cxx
@@ -2149,13 +2149,9 @@ static ::css::beans::Pair<::rtl::OUString,
::rtl::OUString>
// clang-format on
};
-const css::uno::Sequence<::css::beans::Pair<OUString, OUString>>&
-starmathdatabase::getCustomMathmlHtmlEntities()
-{
- static css::uno::Sequence<::css::beans::Pair<OUString, OUString>> data(
+const ::css::uno::Sequence<::css::beans::Pair<OUString, OUString>>
+ starmathdatabase::icustomMathmlHtmlEntities(
icustomMathmlHtmlEntitiesData,
starmathdatabase::STARMATH_MATHMLHTML_ENTITY_NUMBER);
- return data;
-}
static ::css::beans::Pair<::rtl::OUString, ::rtl::OUString>
icustomMathmlHtmlEntitiesNamesExportData[2] = {
@@ -2164,12 +2160,7 @@ static ::css::beans::Pair<::rtl::OUString,
::rtl::OUString>
{ u"∞"_ustr, u"\u221E"_ustr}
// clang-format on
};
-const css::uno::Sequence<::css::beans::Pair<::rtl::OUString, ::rtl::OUString>>&
-starmathdatabase::getCustomMathmlHtmlEntitiesExport()
-{
- static css::uno::Sequence<::css::beans::Pair<::rtl::OUString,
::rtl::OUString>> data(
- icustomMathmlHtmlEntitiesNamesExportData, 2);
- return data;
-};
+const ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString,
::rtl::OUString>>
+
starmathdatabase::icustomMathmlHtmlEntitiesExport(icustomMathmlHtmlEntitiesNamesExportData,
2);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
