diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-22 14:38:45 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-22 22:37:54 +0200 |
commit | 84d20cdc64035af829c568dc7f5b9af625b5b54b (patch) | |
tree | b5570e5aea7bc0d9e79de8ca1a52e31f4cfe56a8 /solenv | |
parent | 9613165239ade3f0b4d3d06e238430aabc9fcff3 (diff) |
Move MimeContentTypeFactory into vcl
The code is just used in vcl from LO's POV.
This way we can drop the dtrans directory and get rid of yet an
other library.
Change-Id: Id77568e63a6fef4af30b49e035a9d76211b127a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103210
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/native-code.py | 3 | ||||
-rw-r--r-- | solenv/clang-format/excludelist | 12 | ||||
-rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 | ||||
-rw-r--r-- | solenv/qa/python/gbuildtojson.py | 2 |
4 files changed, 8 insertions, 10 deletions
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'] |