summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Repository.mk1
-rw-r--r--RepositoryModule_host.mk1
-rwxr-xr-xbin/find-german-comments1
-rwxr-xr-xbin/find-mergedlib-can-be-private.py1
-rw-r--r--chart2/CppunitTest_chart2_dump.mk1
-rw-r--r--chart2/CppunitTest_chart2_export.mk1
-rw-r--r--chart2/CppunitTest_chart2_geometry.mk1
-rw-r--r--chart2/CppunitTest_chart2_import.mk1
-rw-r--r--chart2/CppunitTest_chart2_pivot_chart_test.mk1
-rw-r--r--chart2/CppunitTest_chart2_trendcalculators.mk1
-rw-r--r--chart2/CppunitTest_chart2_xshape.mk1
-rw-r--r--dtrans/Library_mcnttype.mk38
-rw-r--r--dtrans/Makefile7
-rw-r--r--dtrans/Module_dtrans.mk26
-rw-r--r--dtrans/README3
-rw-r--r--dtrans/util/mcnttype.component26
-rw-r--r--postprocess/Rdb_services.mk1
-rwxr-xr-xsolenv/bin/native-code.py3
-rw-r--r--solenv/clang-format/excludelist12
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
-rw-r--r--solenv/qa/python/gbuildtojson.py2
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk1
-rw-r--r--svgio/CppunitTest_svgio.mk6
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--vcl/commonfuzzer.mk1
-rw-r--r--vcl/source/cnttype/mcnttfactory.cxx (renamed from dtrans/source/cnttype/mcnttfactory.cxx)0
-rw-r--r--vcl/source/cnttype/mcnttfactory.hxx (renamed from dtrans/source/cnttype/mcnttfactory.hxx)0
-rw-r--r--vcl/source/cnttype/mcnttype.cxx (renamed from dtrans/source/cnttype/mcnttype.cxx)0
-rw-r--r--vcl/source/cnttype/mcnttype.hxx (renamed from dtrans/source/cnttype/mcnttype.hxx)0
-rw-r--r--vcl/vcl.common.component4
-rw-r--r--vcl/workben/cnttype/makefile.mk (renamed from dtrans/source/cnttype/wbench/makefile.mk)0
-rw-r--r--vcl/workben/cnttype/testcnttype.cxx (renamed from dtrans/source/cnttype/wbench/testcnttype.cxx)0
32 files changed, 17 insertions, 127 deletions
diff --git a/Repository.mk b/Repository.mk
index 4e73deaebbd8..d0aca4e0e982 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -605,7 +605,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
localedata_es \
localedata_euro \
localedata_others \
- mcnttype \
$(if $(ENABLE_JAVA), \
$(if $(filter $(OS),MACOSX),,officebean) \
) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 3155224ffd72..dc9725700903 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
dbaccess \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
- dtrans \
drawinglayer \
editeng \
embeddedobj \
diff --git a/bin/find-german-comments b/bin/find-german-comments
index 98ae5acfcee7..a38b435ce870 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -271,7 +271,6 @@ class Parser:
"dbaccess" : 1,
"desktop" : 1,
"drawinglayer" : 1,
- "dtrans" : 1,
"editeng" : 1,
"embeddedobj" : 1,
"embedserv" : 1,
diff --git a/bin/find-mergedlib-can-be-private.py b/bin/find-mergedlib-can-be-private.py
index 314802d9079a..f21f74052917 100755
--- a/bin/find-mergedlib-can-be-private.py
+++ b/bin/find-mergedlib-can-be-private.py
@@ -43,7 +43,6 @@ merged_libs = { \
,"i18nutil" \
,"lng" \
,"localebe1" \
- ,"mcnttype" \
,"msfilter" \
,"mtfrenderer" \
,"opencl" \
diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk
index 3eb7d06a4cf8..4bf7d692c1c6 100644
--- a/chart2/CppunitTest_chart2_dump.mk
+++ b/chart2/CppunitTest_chart2_dump.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_dump,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 8caf285b1f1d..29147efc03aa 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
dbaccess/util/dba \
embeddedobj/util/embobj \
emfio/emfio \
diff --git a/chart2/CppunitTest_chart2_geometry.mk b/chart2/CppunitTest_chart2_geometry.mk
index fb07f9108a5f..457d7ffd3036 100644
--- a/chart2/CppunitTest_chart2_geometry.mk
+++ b/chart2/CppunitTest_chart2_geometry.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_geometry,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
dbaccess/util/dba \
embeddedobj/util/embobj \
emfio/emfio \
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 18c264bbc615..f91d0f95d29c 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
embeddedobj/util/embobj \
emfio/emfio \
eventattacher/source/evtatt \
diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk
index 960c0a511b76..3ec960e46a2d 100644
--- a/chart2/CppunitTest_chart2_pivot_chart_test.mk
+++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk
@@ -73,7 +73,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_pivot_chart_test,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
dbaccess/util/dba \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index afbb7c0ef9b4..f8c14bfba120 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index 9e048bce96fe..08d43565d107 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dtrans/util/mcnttype \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
deleted file mode 100644
index fd023a7eb4eb..000000000000
--- a/dtrans/Library_mcnttype.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-$(eval $(call gb_Library_Library,mcnttype))
-
-$(eval $(call gb_Library_set_componentfile,mcnttype,dtrans/util/mcnttype))
-
-$(eval $(call gb_Library_use_sdk_api,mcnttype))
-
-$(eval $(call gb_Library_use_libraries,mcnttype,\
- cppu \
- cppuhelper \
- sal \
- tl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,mcnttype,\
- dtrans/source/cnttype/mcnttfactory \
- dtrans/source/cnttype/mcnttype \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Makefile b/dtrans/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/dtrans/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk
deleted file mode 100644
index f583c41e88bb..000000000000
--- a/dtrans/Module_dtrans.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-$(eval $(call gb_Module_Module,dtrans))
-
-$(eval $(call gb_Module_add_targets,dtrans,\
- Library_mcnttype \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/README b/dtrans/README
deleted file mode 100644
index 73aca8b6e496..000000000000
--- a/dtrans/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Used to be a module for data transfer, but just contained Windows code.
-Now it just contains the MimeContentTypeFactory, which probably should move to
-vcl too, since it's just used there.
diff --git a/dtrans/util/mcnttype.component b/dtrans/util/mcnttype.component
deleted file mode 100644
index 077181d422b0..000000000000
--- a/dtrans/util/mcnttype.component
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.datatransfer.MimeCntTypeFactory"
- constructor="dtrans_CMimeContentTypeFactory_get_implementation">
- <service name="com.sun.star.datatransfer.MimeContentTypeFactory"/>
- </implementation>
-</component>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5781081d96de..6526fd877349 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Rdb_add_components,services,\
chart2/source/chartcore \
cui/util/cui \
desktop/source/deployment/deployment \
- dtrans/util/mcnttype \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
filter/source/msfilter/msfilter \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 87b29db10c4e..7bf89d9dda22 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -119,8 +119,6 @@ core_constructor_list = [
"com_sun_star_comp_dba_ORowSet_get_implementation",
# drawinglayer/drawinglayer.component
"drawinglayer_XPrimitive2DRenderer",
-# dtrans/util/mcnttype.component
- "dtrans_CMimeContentTypeFactory_get_implementation",
# embeddedobj/util/embobj.component
"embeddedobj_UNOEmbeddedObjectCreator_get_implementation",
"embeddedobj_OOoEmbeddedObjectFactory_get_implementation",
@@ -423,6 +421,7 @@ core_constructor_list = [
"com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
# vcl/*.component
+ "dtrans_CMimeContentTypeFactory_get_implementation",
"vcl_SystemClipboard_get_implementation",
# xmloff/source/transform/xof.component
"xmloff_XMLCalcContentImportOOO_get_implementation",
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2669c1fe4420..8fd395b201af 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3762,12 +3762,6 @@ drawinglayer/source/tools/emfpstringformat.cxx
drawinglayer/source/tools/emfpstringformat.hxx
drawinglayer/source/tools/primitive2dxmldump.cxx
drawinglayer/source/tools/wmfemfhelper.cxx
-dtrans/source/cnttype/mcnttfactory.cxx
-dtrans/source/cnttype/mcnttfactory.hxx
-dtrans/source/cnttype/mcnttype.cxx
-dtrans/source/cnttype/mcnttype.hxx
-dtrans/source/cnttype/mctfentry.cxx
-dtrans/source/cnttype/wbench/testcnttype.cxx
editeng/inc/AccessibleStringWrap.hxx
editeng/inc/editattr.hxx
editeng/inc/editdoc.hxx
@@ -16911,6 +16905,11 @@ vcl/source/bitmap/bitmap.cxx
vcl/source/bitmap/bitmapfilter.cxx
vcl/source/bitmap/checksum.cxx
vcl/source/bitmap/salbmp.cxx
+vcl/source/cnttype/mcnttfactory.cxx
+vcl/source/cnttype/mcnttfactory.hxx
+vcl/source/cnttype/mcnttype.cxx
+vcl/source/cnttype/mcnttype.hxx
+vcl/source/cnttype/mctfentry.cxx
vcl/source/components/dtranscomp.cxx
vcl/source/components/factory.cxx
vcl/source/components/fontident.cxx
@@ -17409,6 +17408,7 @@ vcl/win/window/salobj.cxx
vcl/workben/602fuzzer.cxx
vcl/workben/bmpfuzzer.cxx
vcl/workben/cgmfuzzer.cxx
+vcl/workben/cnttype/testcnttype.cxx
vcl/workben/commonfuzzer.hxx
vcl/workben/docxfuzzer.cxx
vcl/workben/dtrans/test_dtrans.cxx
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a1b1e6134f9b..dfd3ebdc227e 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -54,7 +54,6 @@ MERGE_LIBRARY_LIST := \
lng \
lnth \
localebe1 \
- mcnttype \
msfilter \
mtfrenderer \
numbertext \
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index ccb7893ccb0f..b54c901e9974 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -124,7 +124,7 @@ class CheckGbuildToJsonModules(unittest.TestCase):
shutil.rmtree(self.tempwork)
def test_gbuildtojson(self):
- modules = ['accessibility', 'android', 'animations', 'apple_remote', 'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper', 'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtools', 'toolkit', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript', 'xmlsecurity']
+ modules = ['accessibility', 'android', 'animations', 'apple_remote', 'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 'drawinglayer', 'editeng', 'embeddedobj', 'embedserv', 'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper', 'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtools', 'toolkit', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript', 'xmlsecurity']
if os.environ['OS'] == 'WNT':
# for now, use a limited subset for testing on windows as it is so annoyingly slow on this
modules = ['chart2', 'cui', 'dbaccess', 'framework', 'oox', 'sfx2', 'svl', 'svtools', 'svx', 'toolkit', 'vcl', 'xmloff']
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 41e65c499010..6926c34ac0a7 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_CppunitTest_use_vcl,starmath_qa_cppunit))
$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
configmgr/source/configmgr \
- dtrans/util/mcnttype \
framework/util/fwk \
i18npool/util/i18npool \
package/source/xstor/xstor \
diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk
index c6f4db91fc60..d690f2383116 100644
--- a/svgio/CppunitTest_svgio.mk
+++ b/svgio/CppunitTest_svgio.mk
@@ -52,17 +52,17 @@ $(eval $(call gb_CppunitTest_use_vcl,svgio))
$(eval $(call gb_CppunitTest_use_components,svgio,\
configmgr/source/configmgr \
- dtrans/util/mcnttype \
framework/util/fwk \
i18npool/util/i18npool \
package/source/xstor/xstor \
package/util/package2 \
- toolkit/util/tk \
+ sax/source/expatwrap/expwrap \
sfx2/util/sfx \
+ toolkit/util/tk \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
unotools/util/utl \
- sax/source/expatwrap/expwrap \
+ vcl/vcl.common \
))
$(eval $(call gb_CppunitTest_use_configuration,svgio))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3570b4091d7d..ac63bb3606b7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -117,6 +117,8 @@ endif
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/animate/Animation \
vcl/source/animate/AnimationBitmap \
+ vcl/source/cnttype/mcnttfactory \
+ vcl/source/cnttype/mcnttype \
vcl/source/printer/QueueInfo \
vcl/source/window/errinf \
vcl/source/window/settings \
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 43743256d8b5..136c7759d1f1 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -65,7 +65,6 @@ fuzzer_core_libraries = \
i18nutil \
lng \
localebe1 \
- mcnttype \
msfilter \
package2 \
sax \
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/vcl/source/cnttype/mcnttfactory.cxx
index 4a3e6fbb4d95..4a3e6fbb4d95 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/vcl/source/cnttype/mcnttfactory.cxx
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/vcl/source/cnttype/mcnttfactory.hxx
index c9bd3518cdf3..c9bd3518cdf3 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/vcl/source/cnttype/mcnttfactory.hxx
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/vcl/source/cnttype/mcnttype.cxx
index 8b35abb23193..8b35abb23193 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/vcl/source/cnttype/mcnttype.cxx
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/vcl/source/cnttype/mcnttype.hxx
index c4053066b733..c4053066b733 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/vcl/source/cnttype/mcnttype.hxx
diff --git a/vcl/vcl.common.component b/vcl/vcl.common.component
index 77fbf38a1973..a884f6bd8c2e 100644
--- a/vcl/vcl.common.component
+++ b/vcl/vcl.common.component
@@ -27,4 +27,8 @@
constructor="com_sun_star_graphic_GraphicObject_get_implementation">
<service name="com.sun.star.graphic.GraphicObject"/>
</implementation>
+ <implementation name="com.sun.star.datatransfer.MimeCntTypeFactory"
+ constructor="dtrans_CMimeContentTypeFactory_get_implementation">
+ <service name="com.sun.star.datatransfer.MimeContentTypeFactory"/>
+ </implementation>
</component>
diff --git a/dtrans/source/cnttype/wbench/makefile.mk b/vcl/workben/cnttype/makefile.mk
index ad1e635eb729..ad1e635eb729 100644
--- a/dtrans/source/cnttype/wbench/makefile.mk
+++ b/vcl/workben/cnttype/makefile.mk
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/vcl/workben/cnttype/testcnttype.cxx
index a148348ff6cb..a148348ff6cb 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/vcl/workben/cnttype/testcnttype.cxx