RepositoryModule_host.mk | 4
bin/find-mergedlib-can-be-private.classes.results | 132 +++++++++++++++++++++-
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2
3 files changed, 133 insertions(+), 5 deletions(-)
New commits:
commit 2f06b252e187c08ed8a5afe138aecdf5d9ab1729
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 23 14:00:14 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 29 18:50:29 2024 +0100
add writerfilter to --enable-mergedlibs=more
Change-Id: I5b04b5e4a1023fc4da61bdcf148829f899e501d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164152
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index c9d322487298..26c97fb0af1a 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -231,10 +231,9 @@ $(eval $(call repositorymodule_serialize,\
$(call gb_Helper_optional,DESKTOP,swui) \
sw sd \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
- writerfilter \
- $(if $(MERGELIBS_MORE),,cui) \
+ $(if $(MERGELIBS_MORE),,writerfilter cui) \
$(if $(MERGELIBS), merged, \
- $(if $(MERGELIBS_MORE),cui,) chartcontroller chartcore oox svx
svxcore xo sfx fwk svt vcl) \
+ $(if $(MERGELIBS_MORE),writerfilter cui,) chartcontroller
chartcore oox svx svxcore xo sfx fwk svt vcl) \
))
endif
endif # !$(DISABLE_DYNLOADING)
diff --git a/bin/find-mergedlib-can-be-private.classes.results
b/bin/find-mergedlib-can-be-private.classes.results
index f8d8d501489f..c54183ed8547 100644
--- a/bin/find-mergedlib-can-be-private.classes.results
+++ b/bin/find-mergedlib-can-be-private.classes.results
@@ -1,29 +1,47 @@
+BitmapColorQuantizationFilter
BitmapConvolutionMatrixFilter
+BitmapEmbossGreyFilter
BitmapMedianFilter
+BitmapMosaicFilter
BitmapPopArtFilter
+BitmapSepiaFilter
+BitmapSharpenFilter
+BitmapSmoothenFilter
BitmapSobelGreyFilter
+BitmapSolarizeFilter
CalendarField
+CodeCompleteOptions
DdeGetPutItem
DdeHotLink
DdeItem
DdeLink
DdeService
DdeTopic
+DialogGalleryPreview
DockingManager
DropdownDockingWindow
E3dCompoundObject
+E3dExtrudeObj
+E3dPolygonObj
EditUndo
EnhancedCustomShape
+FileExportedDialog
FixedBitmap
FixedImage
+FmSearchEngine
FocusListenerMultiplexer
+FontStyleBox
FontSubsetInfo
FormatterBase
+GalleryProgress
+HelpIndexer
HelpLinker
+HelpSearch
Hunspell
Hunzip
ImplJobSetup
IndexerPreProcessor
+InputDialog
KeyListenerMultiplexer
MetaAction
MetaArcAction
@@ -40,29 +58,71 @@ MetricFormatter
MouseListenerMultiplexer
MouseMotionListenerMultiplexer
MyThes
+NotifyBrokenPackage
NotifyEvent
+OpenCLConfig
OpenGLZone
PaintListenerMultiplexer
+RequestPackageReparation
+SEInitializerGpg
SalData
SalInfoPrinter
SalPrinter
SalSystem
SbMethod
SbxObject
+SdrCaptionEscIsRelItem
+SdrCaptionEscRelItem
+SdrCaptionFitLineLenItem
+SdrCaptionLineLenItem
SdrGrafContrastItem
SdrGrafGamma100Item
SdrGrafLuminanceItem
SdrGrafModeItem
+SdrMeasureBelowRefEdgeItem
+SdrMeasureDecimalPlacesItem
+SdrMeasureTextHPosItem
+SdrMeasureTextRota90Item
+SdrMeasureTextVPosItem
+SdrMeasureUnitItem
+SdrPercentItem
SelectionListenerMultiplexer
SfxCharmapContainer
+SfxCommonPrintOptionsTabPage
+SfxHyphenRegionItem
+SfxMacroInfoItem
+SfxStatusForwarder
+SfxTabDialogItem
SkiaZone
SpinListenerMultiplexer
+SvFileInformationManager
+SvtDefaultOptions
+SvtDynamicMenuOptions
+SvtGraphicFill
SvtGraphicFill::Transform
-SvxCharView
+SvtGraphicStroke
+SvxAttrNameTable
+SvxAutoCorrectLanguageLists
+SvxAutocorrWordList
+SvxBmpNumValueSet
+SvxDicListChgClamp
+SvxGraphicItem
+SvxLineEndLB
+SvxLineLB
+SvxNumValueSet
+SvxNumberFormatShell
+SvxPixelCtl
+SvxPresetListBox
+SvxRectCtl
SvxShapeGroupAnyD
SvxShowText
SvxTPage
SvxTextForwarder
+SvxXConnectionPreview
+SvxXLinePreview
+SvxXMeasurePreview
+SvxXRectPreview
+SvxXShadowPreview
SyntaxHighlighter::Tokenizer
SystemWindow::ImplData
TBCExtraInfo
@@ -74,23 +134,52 @@ VclBuilder::ParserState
VclBuilder::sortIntoBestTabTraversalOrder
VclDrawingArea
VclGrid
+VclTestResult
WindowListenerMultiplexer
+XBitmapEntry
+XColorEntry
+XFillAttrSetItem
+XFillUseSlideBackgroundItem
+XLineAttrSetItem
+XMLDocumentWrapper_XmlSecImpl
+XMLSignature_GpgImpl
basegfx::BColorModifier
basegfx::SystemDependentData
basegfx::SystemDependentDataHolder
basegfx::SystemDependentDataManager
basic::vba
canvas
+canvas::CachedPrimitiveBase
+canvas::CanvasCustomSpriteHelper
+canvas::ParametricPolyPolygon
+canvas::PropertySetHelper
+canvas::SpriteRedrawManager
chart
comphelper::MemoryInputStream
+comphelper::OMultiTypeInterfaceContainerHelper2
comphelper::OSLOutputStreamWrapper
+comphelper::RefCountedMutex
+comphelper::SimplePasswordRequest
+comphelper::UnoInterfaceToUniqueIdentifierMapper
comphelper::date
+comphelper::xmlsec
+connectivity::OKeyValue
+connectivity::OSkipDeletedSet
+connectivity::OSortIndex
+connectivity::QuotedTokenizedString
+connectivity::file::OBoolOperator
+connectivity::file::OOp_ISNOTNULL
+connectivity::file::OOp_ISNULL
+connectivity::file::OOp_LIKE
+connectivity::odbc::ODBCDriver
+connectivity::odbc::OStatement_BASE2
+connectivity::odbc::OTools
connectivity::sdbcx::IObjectCollection
+connectivity::sdbcx::ODescriptor
connectivity::sdbcx::OGroup
connectivity::sdbcx::OKey
+connectivity::sdbcx::OUser
dbtools::param::ParameterWrapper
-desktop::CallbackFlushHandler::CallbackData
-desktop::CallbackFlushHandler::TimeoutIdle
drawinglayer::animation::AnimationEntry
drawinglayer::primitive2d::AnimatedSwitchPrimitive2D
drawinglayer::primitive2d::FillGraphicPrimitive2D
@@ -104,22 +193,59 @@ drawinglayer::primitive3d::GroupPrimitive3D
drawinglayer::primitive3d::PolyPolygonMaterialPrimitive3D
drawinglayer::primitive3d::PolygonHairlinePrimitive3D
drawinglayer::primitive3d::SdrPrimitive3D
+drawinglayer::processor2d::TextExtractor2D
formula::FormulaTokenIterator::Item
+framework::DocumentUndoGuard
legacy::CntInt32
legacy::SfxBool
+ooo::vba::ConcreteXShapeGeometryAttributes
+ooo::vba::UserFormGeometryHelper
+oox::GrabBagStack
oox::IProgressBar
+oox::ModelObjectHelper
+oox::ObjectContainer
+oox::core::FastTokenHandler
+oox::core::FilterDetect
oox::drawingml::ShapePropertyInfo
+oox::drawingml::ShapePropertyMap
+oox::drawingml::Theme
+oox::drawingml::ThemeFilterBase
+oox::formulaimport::XmlStreamBuilder
+oox::ole
oox::ole::AxControlModelBase
+oox::shape::ShapeContextHandler
+oox::shape::ShapeFilterBase
+oox::vml::FillModel
+oox::vml::ShadowModel
+openclwrapper::GPUEnv
sdr::SelectionController
+sfx2::sidebar::Context
+sfx2::sidebar::ResourceManager
svt
+svt::BindableControlHelper
+svtools::EditableExtendedColorConfig
+svx::FrameSelector
svxform
+svxform::FmSearchConfigItem
+svxform::FmSearchParams
toolkitform
+ucbhelper::AuthenticationFallbackRequest
ucbhelper::InteractionApprove
+ucbhelper::InteractionAuthFallback
ucbhelper::InteractionDisapprove
ucbhelper::InteractionSupplyAuthentication
ucbhelper::InterceptedInteraction
+ucbhelper::ResultSetMetaData
+ucbhelper::SimpleCertificateValidationRequest
utl::DefaultFontConfiguration
+utl::TempFileFastService
+utl::ZipPackageHelper
utl::detail::Options
vcl::ExtOutDevData
vcl::ILibreOfficeKitNotifier
+vcl::PDFOutputStream
+vcl::PDFWriter
vcl::PrinterController
+weld::HexColorControl
+writerperfect::DirectoryStream::Impl
+xmloff::AnimationsExporter
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ed6df23183a5..6a6cb1eebe11 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -179,6 +179,7 @@ gb_MERGE_LIBRARY_LIST += \
$(if $(filter WNT,$(OS)), \
wininetbe1 \
) \
+ writerfilter \
writerperfect \
xmlsecurity \
commit 9f810031131b761975a6fdefb8be06cc3ff6ea94
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 23 13:54:57 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 29 18:50:20 2024 +0100
add cui to --enable-mergedlibs=more
Change-Id: I124b60d91491b4fecc8c564728f4d36c23845a68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164151
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 8e94c0518a1d..c9d322487298 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -231,9 +231,10 @@ $(eval $(call repositorymodule_serialize,\
$(call gb_Helper_optional,DESKTOP,swui) \
sw sd \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
- writerfilter cui \
+ writerfilter \
+ $(if $(MERGELIBS_MORE),,cui) \
$(if $(MERGELIBS), merged, \
- chartcontroller chartcore oox svx svxcore xo sfx fwk svt vcl) \
+ $(if $(MERGELIBS_MORE),cui,) chartcontroller chartcore oox svx
svxcore xo sfx fwk svt vcl) \
))
endif
endif # !$(DISABLE_DYNLOADING)
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index be34e8d03121..ed6df23183a5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -128,6 +128,7 @@ gb_MERGE_LIBRARY_LIST += \
bib \
cached1 \
$(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
+ cui \
date \
$(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
dlgprov \
