diff options
559 files changed, 38 insertions, 1472 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index a225b8112715..843dcb058245 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ sal \ salhelper \ xmlreader \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/Repository.mk b/Repository.mk index fb86c1b5c5af..057c9b1fb7ad 100644 --- a/Repository.mk +++ b/Repository.mk @@ -550,9 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ log_uno_uno \ unsafe_uno_uno \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ - $(if $(filter $(OS),WNT), \ - uwinapi \ - ) \ )) $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6641d2b63a1b..7a6db951ef94 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3036,7 +3036,7 @@ endif ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)$(if $(filter INTEL,$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ + $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(if $(filter X86_64,$(CPUNAME)),amd64,win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index 8c5df40d0ab8..f7953e80e5a2 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\ cppuhelper \ sal \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl)) diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 3d12cb250ade..bbec944079df 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,acc,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,acc,\ diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 6246d571f38c..359688cd7812 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,animcore,\ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index e662fc379382..72f46a38b5c6 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) ifeq ($(ENABLE_GLTF),TRUE) diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk index b123130c4d53..877efd97ac36 100644 --- a/avmedia/Library_avmediaMacAVF.mk +++ b/avmedia/Library_avmediaMacAVF.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaMacAVF,\ sal \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaMacAVF,\ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 20bf9c30356b..85eca192eb9a 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ sal \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 35a56ac4751b..9b9622b7edc5 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ salhelper \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,avmediagst,\ diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 10c10a001296..16f2d5db1440 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ salhelper \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 64925bf1a44f..eae3efab1e64 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediaogl,\ salhelper \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_include,avmediaogl,\ diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk index b8318eb0b916..0ee5cd2d0d46 100644 --- a/avmedia/Library_avmediavlc.mk +++ b/avmedia/Library_avmediavlc.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,avmediavlc,\ vcl \ utl \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,avmediavlc,\ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 015eb40eac91..09453d6c77ba 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,avmediawin,\ diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk b/basctl/CppunitTest_basctl_dialogs_test.mk index d45c8ab97d8b..0e28c5a748a3 100644 --- a/basctl/CppunitTest_basctl_dialogs_test.mk +++ b/basctl/CppunitTest_basctl_dialogs_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basctl_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,basctl_dialogs_test,boost_headers)) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index ab3a9a67c20a..317056822d92 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\ ucbhelper \ vcl \ xmlscript \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,basctl,\ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 3941a3e1ce52..1710423b5e50 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 68cfe1cfae05..087e4a081419 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_include,basegfx,\ diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk index 343522418cd5..8b0dccece557 100644 --- a/basic/CppunitTest_basic_macros.mk +++ b/basic/CppunitTest_basic_macros.mk @@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \ utl \ vcl \ xmlscript \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index aa03f41ce757..55a6e0faf311 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ utl \ vcl \ xmlscript \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 20892a3b7826..e2ed084131f0 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,sb,\ utl \ vcl \ xmlscript \ - $(gb_UWINAPI) \ )) ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 9d916b3e8e0f..06ad262b5e4f 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -27,8 +27,4 @@ $(eval $(call gb_Library_add_cobjects,officebean,\ )) endif -$(eval $(call gb_Library_use_libraries,officebean,\ - $(gb_UWINAPI) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 00672a608575..5f03fcaa795d 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -94,17 +94,6 @@ public class LocalOfficeConnection try { - NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "uwinapi"); - } - catch (Throwable e) - { - // loading twice would fail - System.err.println("cannot find uwinapi:"); - e.printStackTrace(); - } - - try - { NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "jawt"); } catch (Throwable e) diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 59191f3bfd0c..97f5b78f081d 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -13,7 +13,6 @@ $(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\ diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index b4da09abf523..11c70f5b9db0 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 05f5470847a7..51efc35a5375 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,binaryurp,\ diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 8d70e2195ca6..cdf8308a9636 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ jvmaccess \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,java_uno,\ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index f786fe17ce59..782638018b29 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ tl \ i18nlangtag \ canvastools \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 8f7f606a04d2..17e3565bfe65 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ sal \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 4437e3b9ab85..50658b362f6b 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tk \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,canvastools,\ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 64ff6467be82..2503c139fd2d 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ tl \ utl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 94efa63f2bdc..4a23f6b060f6 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ tl \ utl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk index 2303a8840cb4..979ff6b5d1ea 100644 --- a/canvas/Library_oglcanvas.mk +++ b/canvas/Library_oglcanvas.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,oglcanvas,\ tl \ i18nlangtag \ canvastools \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,oglcanvas,\ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 9de468832868..db4898c72070 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 7789b7586495..805cefc43c77 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tk \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ diff --git a/chart2/CppunitTest_chart2_common_functors.mk b/chart2/CppunitTest_chart2_common_functors.mk index 55a64b257643..947ae6b4e96f 100644 --- a/chart2/CppunitTest_chart2_common_functors.mk +++ b/chart2/CppunitTest_chart2_common_functors.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_common_functors, \ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_common_functors,\ diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk index edc36d1188d2..bfbd0d3d3702 100644 --- a/chart2/CppunitTest_chart2_dialogs_test.mk +++ b/chart2/CppunitTest_chart2_dialogs_test.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,chart2_dialogs_test,boost_headers)) diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk index d181f168d133..a5d7ce8fdaa1 100755 --- a/chart2/CppunitTest_chart2_dump.mk +++ b/chart2/CppunitTest_chart2_dump.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \ vbahelper \ xo \ sw \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_dump,\ diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk index 931edeb21d05..b9ac9b1c9199 100644 --- a/chart2/CppunitTest_chart2_export.mk +++ b/chart2/CppunitTest_chart2_export.mk @@ -56,7 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \ vbahelper \ xo \ sw \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_export,\ diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index 0816949a3fd6..71dce87a20df 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \ vbahelper \ xo \ sw \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_import,\ diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk index 418db1af9cc9..4ca93e2be0ec 100644 --- a/chart2/CppunitTest_chart2_pivot_chart_test.mk +++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \ vbahelper \ xo \ sw \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_pivot_chart_test,\ diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk index cc271d8051bf..de8b20e1ec42 100644 --- a/chart2/CppunitTest_chart2_trendcalculators.mk +++ b/chart2/CppunitTest_chart2_trendcalculators.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \ vbahelper \ xo \ sw \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\ diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index 0f9f51235f95..2efd810d932a 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \ vbahelper \ xo \ sw \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,chart2_xshape,\ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 1f95bc022c29..ee4dc2ea5328 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller)) diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 6d1a7215ac63..f785d097ae54 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore)) diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index cc668e441ae5..f999f947bea8 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,chartopengl,\ diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 6f1a37b8ce10..f0769b627cb2 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ sal \ salhelper \ unoidl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_use_system_win32_libs,climaker,\ diff --git a/comphelper/CppunitTest_comphelper_ifcontainer.mk b/comphelper/CppunitTest_comphelper_ifcontainer.mk index d336c5546ab2..b9f7b4049256 100644 --- a/comphelper/CppunitTest_comphelper_ifcontainer.mk +++ b/comphelper/CppunitTest_comphelper_ifcontainer.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_ifcontainer,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk index 9dade8b53877..0ca808051a80 100644 --- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk +++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index f67601e6a6de..1d16366d6bc6 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/comphelper/CppunitTest_comphelper_threadpool_test.mk b/comphelper/CppunitTest_comphelper_threadpool_test.mk index aa4e0f020a6a..16bbd6fff69b 100644 --- a/comphelper/CppunitTest_comphelper_threadpool_test.mk +++ b/comphelper/CppunitTest_comphelper_threadpool_test.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_threadpool_test, \ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk index 58d490a5d64a..03ded85270fc 100644 --- a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk +++ b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_variadictemplates_test, \ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 49347b336756..0cdd3f935e78 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ salhelper \ ucbhelper \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_sdk_api,comphelper)) diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk index ca9653fd126e..0e227edba37c 100644 --- a/configmgr/CppunitTest_configmgr_unit.mk +++ b/configmgr/CppunitTest_configmgr_unit.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,configmgr_unit, \ unotest \ xmlreader \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,configmgr_unit)) diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 81367ca9e21d..4fc2909ad600 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -62,7 +62,6 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ salhelper \ xmlreader \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr)) diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index ce2e2c2c5032..fcdaf2da8ebb 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_ado, \ unotest \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,connectivity_ado,\ diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index a8f4976310df..d197c94b237c 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -59,7 +59,6 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \ utl \ tl \ svt \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\ diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk index be3b0413b8d1..6504adef8d99 100644 --- a/connectivity/CppunitTest_connectivity_mork.mk +++ b/connectivity/CppunitTest_connectivity_mork.mk @@ -41,7 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_mork, \ unotest \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,connectivity_mork,\ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index d765660c2294..4289a7fe6dc3 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,ado,\ salhelper \ dbtools \ comphelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ado,\ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index a2b355813412..440306b563ca 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,calc,\ dbtools \ file \ comphelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,calc,\ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index e383de8b1ea1..8dcc9c43c50c 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\ utl \ comphelper \ svt \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,dbase,\ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index 214cd55ab8d5..0e1d1fc19a3f 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ dbtools \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,dbpool2,\ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 8fc596bd30d3..eb6dda8cb157 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ tl \ comphelper \ i18nlangtag \ - $(gb_UWINAPI) \ svt \ )) diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index ea207538b183..504eee47f45a 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,evoab,\ salhelper \ dbtools \ file \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,evoab,\ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 765b13bf9998..daacb41838bb 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,file,\ dbtools \ utl \ comphelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,file,\ diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk index 0247f08f3de9..3f3ddc7fce10 100644 --- a/connectivity/Library_firebird_sdbc.mk +++ b/connectivity/Library_firebird_sdbc.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,firebird_sdbc, \ utl \ svt \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc)) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 3916d1665ffc..dd986cd6e6d8 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,flat,\ dbtools \ file \ comphelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,flat,\ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 5fd647c75ece..d1c2bed9e1f8 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ tl \ utl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index c626aad0dff1..2fb57a29cca9 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ utl \ jvmfwk \ comphelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,jdbc,\ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 44f5ad794130..227d8438c43c 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,mork, \ salhelper \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_sdk_api,mork)) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index ad8041369f17..237726caf8a8 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 1803b45827c3..4cb33107ce3b 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,mysql,\ salhelper \ dbtools \ comphelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,mysql,\ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 181114ad3be5..179b6443939c 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,odbc,\ dbtools \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,odbc,\ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 930eaf4d0e09..2ff0b635b890 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ dbtools \ sal \ salhelper \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index c63737231985..8f7efcd02995 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 146b9668088b..494dc4208a09 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ utl \ sal \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,sdbc2,\ diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java index c1d22a8f6633..59541556b185 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java @@ -26,7 +26,6 @@ final class NativeLibraries { public static void load() { if (System.getProperty( "os.name" ).startsWith("Windows")) { loadLibrary("msvcr71"); - loadLibrary("uwinapi"); loadLibrary("sal3"); loadLibrary("dbtoolsmi"); } diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk index ffb22675e36f..e6e7a39d3bae 100644 --- a/cppcanvas/CppunitTest_cppcanvas_test.mk +++ b/cppcanvas/CppunitTest_cppcanvas_test.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_test)) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 13841d227880..5b184296f2f7 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ svt \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,cppcanvas,\ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index 4a33ac0c6eda..e94f12bccdde 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ comphelper \ cppcanvas \ basegfx \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_sdk_api,mtfrenderer)) diff --git a/cppu/CppunitTest_cppu_any-external.mk b/cppu/CppunitTest_cppu_any-external.mk index 6119e048ba99..e56b957ea8ee 100644 --- a/cppu/CppunitTest_cppu_any-external.mk +++ b/cppu/CppunitTest_cppu_any-external.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_set_external_code,cppu_any-external)) $(eval $(call gb_CppunitTest_use_libraries,cppu_any-external, \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_udk_api,cppu_any-external)) diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index da0fa37dcb0a..d565b0fd369c 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_external,cppu_qa_any,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 36c4886ce8eb..9a238fba4551 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -17,7 +17,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index de9b2813b853..426902b5a8de 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_external,cppu_qa_reference,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 45aba8f1d635..a8eb53aa8ca7 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -17,7 +17,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 188d05c71975..c812d94de8ac 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_external,cppu_test_cppumaker,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ diff --git a/cppu/Library_affine_uno_uno.mk b/cppu/Library_affine_uno_uno.mk index aeae6ed7f2c2..10b5389b51d6 100644 --- a/cppu/Library_affine_uno_uno.mk +++ b/cppu/Library_affine_uno_uno.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_udk_api,affine_uno_uno)) $(eval $(call gb_Library_use_libraries,affine_uno_uno,\ purpenvhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,affine_uno_uno,\ diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 69e75cd61354..8031487af373 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_external,cppu,boost_headers)) $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,cppu,\ diff --git a/cppu/Library_log_uno_uno.mk b/cppu/Library_log_uno_uno.mk index 410f12ccd5e4..92d287ea7192 100644 --- a/cppu/Library_log_uno_uno.mk +++ b/cppu/Library_log_uno_uno.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_libraries,log_uno_uno,\ cppu \ purpenvhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,log_uno_uno,\ diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 7264311a1b2f..42c03749a4b7 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_udk_api,purpenvhelper)) $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\ diff --git a/cppu/Library_unsafe_uno_uno.mk b/cppu/Library_unsafe_uno_uno.mk index 59867bac237e..9733f7216f6b 100644 --- a/cppu/Library_unsafe_uno_uno.mk +++ b/cppu/Library_unsafe_uno_uno.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_udk_api,unsafe_uno_uno)) $(eval $(call gb_Library_use_libraries,unsafe_uno_uno,\ purpenvhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,unsafe_uno_uno,\ diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index b3988242675e..1d745b6410bf 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index b59b36a1af04..d973e748d89b 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index d5792d70c807..9a6322caf9d6 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 580a70f41ad9..9d05bf8c5529 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ salhelper \ unoidl \ xmlreader \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_static_libraries,cppuhelper,\ diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index ff6aeb81754d..4a766c57d5cf 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_use_externals,uno,\ diff --git a/cui/CppunitTest_cui_dialogs_test.mk b/cui/CppunitTest_cui_dialogs_test.mk index cb6ae8dbf2c6..353abb8a3a25 100644 --- a/cui/CppunitTest_cui_dialogs_test.mk +++ b/cui/CppunitTest_cui_dialogs_test.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test,boost_headers)) diff --git a/cui/CppunitTest_cui_dialogs_test_2.mk b/cui/CppunitTest_cui_dialogs_test_2.mk index 24bf50e26e7b..afdc4f9a8b5a 100644 --- a/cui/CppunitTest_cui_dialogs_test_2.mk +++ b/cui/CppunitTest_cui_dialogs_test_2.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test2, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test2,boost_headers)) diff --git a/cui/CppunitTest_cui_dialogs_test_3.mk b/cui/CppunitTest_cui_dialogs_test_3.mk index 80511e4c6bb8..69263dafeb79 100644 --- a/cui/CppunitTest_cui_dialogs_test_3.mk +++ b/cui/CppunitTest_cui_dialogs_test_3.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test3, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test3,boost_headers)) diff --git a/cui/CppunitTest_cui_dialogs_test_4.mk b/cui/CppunitTest_cui_dialogs_test_4.mk index c5716b3de50d..79779b461ab6 100644 --- a/cui/CppunitTest_cui_dialogs_test_4.mk +++ b/cui/CppunitTest_cui_dialogs_test_4.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test4, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,cui_dialogs_test4,boost_headers)) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 64f7844e8ecd..74fbc31f0c24 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,cui,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,cui,\ diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index 31dfae515f7b..de5b2a8ff0ab 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -56,7 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\ diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index 0285625d0e9a..68cfeb6eb808 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\ diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk index a4c653dc0c3e..3ed9a0649fb7 100644 --- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk +++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,dbaccess_dialogs_test,boost_headers)) diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index 5ee18d16541b..a7122b537a3b 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_embeddeddb_performancetest, tl \ unotest \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_embeddeddb_performancetest,\ diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk index 3c01fe0728cb..268ebf8439ac 100644 --- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk @@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\ diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index 491f853be252..5652e6622d76 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_test, \ test \ unotest \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\ diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index 5a83a4bbe5d3..41c54b05d85a 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \ tk \ unotest \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\ diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 115bbfb22d4e..82829acd1ec7 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk index 258eeb5e1a30..71e517c2e31a 100644 --- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk @@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_nolib_save, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,dbaccess_nolib_save,\ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 66364c91b61c..ea37824924cd 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -13,10 +13,6 @@ $(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES)) $(eval $(call gb_Library_use_sdk_api,odbcconfig)) -$(eval $(call gb_Executable_use_libraries,odbcconfig,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index beeddad744c4..ed92df704917 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,dba,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index aa009092b9b9..ae92553677af 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml)) diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 05a0788cdf2b..3fb6dde2c7b5 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ utl \ vcl \ xmlscript \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index b29a3d41b114..2192c77e4ebe 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,dbu,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 08d483a8eb32..50c67d364dc2 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ salhelper \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt)) diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk b/desktop/CppunitTest_desktop_dialogs_test.mk index d51f7c70089f..ce26857ab8ff 100644 --- a/desktop/CppunitTest_desktop_dialogs_test.mk +++ b/desktop/CppunitTest_desktop_dialogs_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,desktop_dialogs_test,boost_headers)) diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk index bfcbf56294fb..7f7a7c77c88b 100644 --- a/desktop/CppunitTest_desktop_lib.mk +++ b/desktop/CppunitTest_desktop_lib.mk @@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,desktop_lib, \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index a4b18c55a5db..02b31fef736c 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ shell32 \ )) -$(eval $(call gb_Executable_use_libraries,quickstart,\ - $(gb_UWINAPI) \ -)) - ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 9d35f56554da..4dd6be02a9ee 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sbase,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,sbase,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,sbase,\ winlauncher \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 0a0084979a64..fc066770b945 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,scalc,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,scalc,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,scalc,\ winlauncher \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 17f65ec6b770..1b12bb0f2467 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sdraw,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,sdraw,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,sdraw,\ winlauncher \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index d486f5716aff..7376b7bd3883 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,simpress,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,simpress,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,simpress,\ winlauncher \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 980cc544edcd..249f62223bfe 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,smath,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,smath,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,smath,\ winlauncher \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 0a6a0ccc5a4a..d1847d7bf76a 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) -$(eval $(call gb_Executable_use_libraries,soffice,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_system_win32_libs,soffice,\ advapi32 \ shell32 \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index f18e9dcd1fd8..6db3c110cc1f 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 25efba659ec8..0bbc83877742 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sweb,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,sweb,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,sweb,\ winlauncher \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index f7b522800177..6fbf9bd5057c 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,swriter,\ /ENTRY:wWinMainCRTStartup \ )) -$(eval $(call gb_Executable_use_libraries,swriter,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_use_static_libraries,swriter,\ winlauncher \ )) diff --git a/desktop/Executable_unopkg_bin.mk b/desktop/Executable_unopkg_bin.mk index 2ee1985e9742..27ebc5db1eca 100644 --- a/desktop/Executable_unopkg_bin.mk +++ b/desktop/Executable_unopkg_bin.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Executable_use_libraries,unopkg_bin,\ sal \ tl \ unopkgapp \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_cobjects,unopkg_bin,\ diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk index d6d9b8b91cc5..e61e837d96d4 100644 --- a/desktop/Library_crashreport.mk +++ b/desktop/Library_crashreport.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,crashreport,\ sal \ salhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,crashreport,\ diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index ac32cebc1734..dbc55a700e04 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\ utl \ xmlscript \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment)) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index cca6211b3a10..a16b567ea5d4 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 632b7b67e993..b3754912f54c 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ utl \ xmlscript \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,deploymentmisc,\ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index e6ea8cf597d0..21f5c1db175d 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2)) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index e1540ea15d51..73c38bb291f7 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3)) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 7ca5d2ce4586..e02946b76692 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 29185e08f707..64b8bb3841d4 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -72,7 +72,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) ifeq ($(OS),MACOSX) diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index d2bb2a15fb38..89c8e53b9e8a 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,spl,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 8c41170773d5..b8978625c3f7 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ utl \ vcl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ diff --git a/drawinglayer/CppunitTest_drawinglayer_border.mk b/drawinglayer/CppunitTest_drawinglayer_border.mk index db8703292861..194c86a6e8ca 100644 --- a/drawinglayer/CppunitTest_drawinglayer_border.mk +++ b/drawinglayer/CppunitTest_drawinglayer_border.mk @@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_border, \ test \ tl \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,drawinglayer_border,\ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 690c73aaccd9..8c431c8ec08f 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ tk \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 9ce6c4439e05..8eecd53db50c 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,dnd,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,dnd,\ diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index 03620e52c273..a4f3413fc4f6 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,dtrans,\ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 7d4a5a260a17..5a16ee83c419 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,ftransl,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,ftransl,\ diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 2470f1bffca8..c139e88fed27 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,mcnttype,\ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 5ba93cc51b60..c9ab99cc1c14 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk index 96646899f895..3c82289f8ee1 100644 --- a/dtrans/source/win32/workbench/makefile.mk +++ b/dtrans/source/win32/workbench/makefile.mk @@ -48,7 +48,6 @@ APP1OBJS= $(OBJ)$/test_wincb.obj APP1STDLIBS= $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(SOLARLIBDIR)$/uwinapi.lib\ $(USER32LIB) \ $(OLE32LIB)\ $(COMDLG32LIB) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 121f4951e26e..d5fee7c23d57 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ salhelper \ i18nlangtag \ i18nutil \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index c7a9610e55a9..9cb41fe01cbc 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -40,7 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index 0a1422d4b036..cdc421123d5e 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ salhelper \ i18nlangtag \ i18nutil \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\ diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 88ba8557bb50..81cbf9332255 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -148,7 +148,6 @@ $(eval $(call gb_Library_use_libraries,editeng,\ sax \ i18nlangtag \ i18nutil \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,editeng,\ diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 7de4e48dd5e8..87c33c893d6f 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,embobj,\ svt \ vcl \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,embobj,\ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 8878045469a2..9e3c1b5950d2 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,emboleobj,\ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index c6c5b9aa6e62..559f8d713450 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,emser,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,emser,\ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index a000c9cf4786..ee9c25497d93 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -21,10 +21,6 @@ $(eval $(call gb_Library_use_system_win32_libs,inprocserv,\ uuid \ )) -$(eval $(call gb_Library_use_libraries,inprocserv,\ - $(gb_UWINAPI) \ -)) - ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /DEF:$(SRCDIR)/embedserv/source/inprocserv/inprocserv.def \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index eff84dfd4a29..71ec10f86a18 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,evtatt,\ diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 1d802522c65e..9d494e4e5257 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ salhelper \ test \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_library_objects,extensions_test_update, \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index e12bd2661e55..ad2f062b690a 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -58,7 +58,6 @@ $(eval $(call gb_Library_use_libraries,abp,\ utl \ vcl \ i18nlangtag \ - $(gb_UWINAPI) \ )) # vim:set noet sw=4 ts=4: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 2eff260de83f..1f04de241c23 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,bib,\ sal \ salhelper \ i18nlangtag \ - $(gb_UWINAPI) \ )) # vim:set noet sw=4 ts=4: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 10019aa301c0..6ddd129a6ac6 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,dbp,\ sal \ salhelper \ i18nlangtag \ - $(gb_UWINAPI) \ )) # vim:set noet sw=4 ts=4: diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 99f8090db335..69115fe8d58e 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,log,\ cppu \ sal \ tl \ - $(gb_UWINAPI) \ )) # vim:set noet sw=4 ts=4: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 20de189063b2..58d9319c18e7 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,pcr,\ cppu \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,pcr,\ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 83603333064d..80505f471350 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,res,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,res,\ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 73716d1e9ab5..ef17a0ee3d85 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppu \ sal \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,scn,\ diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 98d544034ff4..0bf3f8cfb60b 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -24,9 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ external/coinmp/werror-format-security.patch.0 \ external/coinmp/werror-undef.patch.0 \ external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ - $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \ - $(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \ - ) \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \ external/coinmp/werror-format-pedantic.patch.0 \ external/coinmp/ubsan.patch.0 \ diff --git a/external/coinmp/coinmp-vs2013.patch.1 b/external/coinmp/coinmp-vs2013.patch.1 deleted file mode 100644 index 2b06c1519a78..000000000000 --- a/external/coinmp/coinmp-vs2013.patch.1 +++ /dev/null @@ -1,352 +0,0 @@ --*- Mode:Diff -*- ---- coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj -+++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj -+++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -26,27 +26,27 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - <WholeProgramOptimization>false</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - <WholeProgramOptimization>false</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - </PropertyGroup> ---- coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj -+++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj -+++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj -+++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj -+++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -26,24 +26,24 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ---- coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj -+++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -26,24 +26,24 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ---- coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj -+++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj -+++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -24,25 +24,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index f72c040c513b..8c87693b82ec 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-notests.patch.1 \ - $(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \ external/poppler/poppler-mac-fake.patch.1 \ external/poppler/ubsan.patch.0 \ external/poppler/poppler-libjpeg.patch.1 \ diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1 deleted file mode 100644 index 577660580489..000000000000 --- a/external/poppler/poppler-snprintf.patch.1 +++ /dev/null @@ -1,34 +0,0 @@ ---- poppler-0.22.5/poppler/Catalog.cc 2013-06-09 12:16:12.000000000 +0200 -+++ poppler-0.22.5/poppler/Catalog.cc 2013-07-08 16:54:30.712095880 +0200 -@@ -40,6 +40,9 @@ - - #include <stddef.h> - #include <stdlib.h> -+#ifdef _WIN32 -+# include <systools/win32/snprintf.h> -+#endif - #include "goo/gmem.h" - #include "Object.h" - #include "PDFDoc.h" ---- poppler-0.22.5/poppler/GlobalParams.cc 2013-03-25 22:48:34.000000000 +0100 -+++ poppler-0.22.5/poppler/GlobalParams.cc 2013-07-08 16:55:04.753303654 +0200 -@@ -57,6 +57,7 @@ - #ifdef _WIN32 - # include <shlobj.h> - # include <mbstring.h> -+# include <systools/win32/snprintf.h> - #endif - #include "goo/gmem.h" - #include "goo/GooString.h" ---- poppler-0.22.5/poppler/PageLabelInfo.cc 2013-03-25 22:48:34.000000000 +0100 -+++ poppler-0.22.5/poppler/PageLabelInfo.cc 2013-07-08 16:56:47.977901129 +0200 -@@ -17,6 +17,9 @@ - #include <stdlib.h> - #include <stdio.h> - #include <assert.h> -+#ifdef _WIN32 -+# include <systools/win32/snprintf.h> -+#endif - - #include "PageLabelInfo.h" - #include "PageLabelInfo_p.h" diff --git a/filter/CppunitTest_filter_dialogs_test.mk b/filter/CppunitTest_filter_dialogs_test.mk index 32dd32471aff..7ae73639c7e2 100644 --- a/filter/CppunitTest_filter_dialogs_test.mk +++ b/filter/CppunitTest_filter_dialogs_test.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,filter_dialogs_test,boost_headers)) diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk index 19511c73ce6f..4a10c1845cef 100644 --- a/filter/CppunitTest_filter_dxf_test.mk +++ b/filter/CppunitTest_filter_dxf_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_dxf_test)) diff --git a/filter/CppunitTest_filter_eps_test.mk b/filter/CppunitTest_filter_eps_test.mk index befc029d6cfe..f708fb5a9bce 100644 --- a/filter/CppunitTest_filter_eps_test.mk +++ b/filter/CppunitTest_filter_eps_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_eps_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_eps_test)) diff --git a/filter/CppunitTest_filter_met_test.mk b/filter/CppunitTest_filter_met_test.mk index 4a0027fdde36..6bf756f2a671 100644 --- a/filter/CppunitTest_filter_met_test.mk +++ b/filter/CppunitTest_filter_met_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_met_test)) diff --git a/filter/CppunitTest_filter_msfilter.mk b/filter/CppunitTest_filter_msfilter.mk index aa567cd7c25e..ad4596d4edb0 100644 --- a/filter/CppunitTest_filter_msfilter.mk +++ b/filter/CppunitTest_filter_msfilter.mk @@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_msfilter, \ cppu \ msfilter \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,filter_msfilter,\ diff --git a/filter/CppunitTest_filter_pcd_test.mk b/filter/CppunitTest_filter_pcd_test.mk index 4d6406956aba..3741d5c9bf5a 100644 --- a/filter/CppunitTest_filter_pcd_test.mk +++ b/filter/CppunitTest_filter_pcd_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_pcd_test)) diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk index 4a31c51f2d8c..12334d75ad42 100644 --- a/filter/CppunitTest_filter_pcx_test.mk +++ b/filter/CppunitTest_filter_pcx_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_pcx_test)) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 685863794a79..bba3113a4473 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ utl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \ diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk index 5ccbde7df3de..273db952300d 100644 --- a/filter/CppunitTest_filter_ppm_test.mk +++ b/filter/CppunitTest_filter_ppm_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_ppm_test)) diff --git a/filter/CppunitTest_filter_priority.mk b/filter/CppunitTest_filter_priority.mk index e5046ac0e3a2..e9bc7de8f196 100644 --- a/filter/CppunitTest_filter_priority.mk +++ b/filter/CppunitTest_filter_priority.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_priority, \ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,filter_priority,\ diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk index 503d1006e4e7..22a2531eb43f 100644 --- a/filter/CppunitTest_filter_psd_test.mk +++ b/filter/CppunitTest_filter_psd_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_psd_test)) diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk index 9265db9857ec..50f6852a7b2b 100644 --- a/filter/CppunitTest_filter_ras_test.mk +++ b/filter/CppunitTest_filter_ras_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_ras_test)) diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index d62addca5bdd..33ae034c0e30 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_tga_test)) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index d3dfdae4a7a5..23a7bbf9ccac 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,filter_tiff_test)) diff --git a/filter/CppunitTest_filter_xslt.mk b/filter/CppunitTest_filter_xslt.mk index 123149020eb7..8bf69a0aec93 100644 --- a/filter/CppunitTest_filter_xslt.mk +++ b/filter/CppunitTest_filter_xslt.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_xslt, \ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,filter_xslt,\ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index d5e32c74339c..d63808600bb1 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,svg2odf,\ diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 602d2b17aa70..84321667f05f 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ sal \ salhelper \ i18nlangtag \ - $(gb_UWINAPI) \ )) diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index f3ea2733d123..c0fc10a66e45 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,flash,\ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index 2c00c75e2ea6..167f6c758b34 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,gie,\ tk \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,gie,\ diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk index b4201f1d8985..60b20eb2491d 100644 --- a/filter/Library_graphicfilter.mk +++ b/filter/Library_graphicfilter.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,graphicfilter,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,graphicfilter,\ diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index a84ae9a73bf4..54d733358937 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,icg,\ tl \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,icg,\ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 87e89c6a3d33..b15e548f522a 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,msfilter,\ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index 528a2b0b0836..8ed2aa4ce199 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,odfflatxml,\ diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 6de7d341367e..21be2a1cd5ee 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,pdffilter,\ diff --git a/filter/Library_storagefd.mk b/filter/Library_storagefd.mk index 5b05e7e5c4ee..4b9d948f3d97 100644 --- a/filter/Library_storagefd.mk +++ b/filter/Library_storagefd.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,storagefd,\ sfx \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,storagefd,\ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 82f3aeedb615..2638d586129f 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,svgfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 8aa293ee1254..1b2d3ed6fa89 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppu \ sal \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,t602filter,\ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index d5ecb7bf732a..e6d3889410af 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_use_libraries,textfd,\ tl \ utl \ svt \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,textfd,\ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index e23cd7d2df74..4f81d7f51b67 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xmlfa,\ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index 601a7678312b..c95dcc692ec9 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ svl \ utl \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xmlfd,\ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 6e31333bbc84..737f79e7b225 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xsltdlg,\ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index eb48793f8256..92e2e11e2f64 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ cppu \ salhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,xsltfilter,\ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 43339b45470f..cae705c85c8c 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,frm,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,frm,\ diff --git a/formula/CppunitTest_formula_dialogs_test.mk b/formula/CppunitTest_formula_dialogs_test.mk index b3dd51eea949..7d47660dcee7 100644 --- a/formula/CppunitTest_formula_dialogs_test.mk +++ b/formula/CppunitTest_formula_dialogs_test.mk @@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,formula_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,formula_dialogs_test,boost_headers)) diff --git a/formula/Library_for.mk b/formula/Library_for.mk index ad7da5af3445..dcac26d4a12b 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,for,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index adddca87ca24..7097146d3bec 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,forui,\ utl \ vcl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,forui,\ diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk b/fpicker/CppunitTest_fpicker_dialogs_test.mk index 92f8989aedc9..398150060e3f 100644 --- a/fpicker/CppunitTest_fpicker_dialogs_test.mk +++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk @@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,fpicker_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,fpicker_dialogs_test,boost_headers)) diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index c57b411c45c4..30c0a5af380a 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,fps,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,fps,\ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 6c484a0a4a31..cc869d906613 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ utl \ vcl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fps_office,\ diff --git a/framework/CppunitTest_framework_dispatch.mk b/framework/CppunitTest_framework_dispatch.mk index 7e99ed5ec29a..2a239030d6d2 100644 --- a/framework/CppunitTest_framework_dispatch.mk +++ b/framework/CppunitTest_framework_dispatch.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_dispatch, \ sal \ test \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,framework_dispatch,boost_headers)) diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 0559236b2bad..2931e52e0ca7 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,fwe,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fwe,\ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index ed8dfb2b6c10..c19ddc866cde 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,fwi,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fwi,\ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index f5b8f23fe978..e20b8b22cc17 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,fwk,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fwk,\ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 44781e32977f..246b83ae80a7 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,fwl,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fwl,\ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 176b65b474a3..7c979f5a3c5d 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,fwm,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fwm,\ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index be1a8046dbb2..b62abefd7a8a 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ sal \ test \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,hwpfilter_test_hwpfilter)) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index e3b62848da51..216fbe754e6d 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_libraries,hwp,\ sal \ utl \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,hwp,\ diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index 975a1dd0d566..72402632d341 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 140d8678429a..a68a5940344d 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_add_defs,i18nlangtag,\ $(eval $(call gb_Library_use_libraries,i18nlangtag,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,i18nlangtag,\ diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 3c91d25e6dab..4aa538114a33 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ cppuhelper \ sal \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index be3b1eea60cb..e9999b89966d 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification cppuhelper \ sal \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index 74d3462174db..a69e703c9c33 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ cppuhelper \ sal \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk index 2bca0171bb70..f48c93227f2b 100644 --- a/i18npool/CppunitTest_i18npool_test_textsearch.mk +++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk @@ -33,7 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_textsearch,\ cppuhelper \ sal \ unotest \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 57c3cfd72b30..06b05e9e1527 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 948485a03d57..5ac58c24e5b3 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,genconv_dict)) $(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index 69230cf52c07..9b183aa0814c 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,gendict)) $(eval $(call gb_Executable_use_libraries,gendict,\ sal \ - $(gb_UWINAPI) \ )) ifeq ($(gb_Side),build) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 0a10b1368444..e96e7dc8e4b1 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,genindex_data)) $(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_use_externals,genindex_data,\ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index 0938af4eef28..085dea641e19 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,saxparser,\ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 52741ac610ae..447985b43c3a 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -13,10 +13,6 @@ i18npool_LCDTXTS := $(if $(i18npool_ICULT53), $(i18npool_LCDALL), $(filter-out % $(eval $(call gb_Library_Library,collator_data)) -$(eval $(call gb_Library_use_libraries,collator_data,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(i18npool_LCDTXTS),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index 633d11538391..398b768fe3c0 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Library_Library,dict_ja)) -$(eval $(call gb_Library_use_libraries,dict_ja,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index 67be8a3904ba..48c71c6f2a3a 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Library_Library,dict_zh)) -$(eval $(call gb_Library_use_libraries,dict_zh,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5da2cd447d2e..be21f8b45fa5 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ i18nlangtag \ i18nutil \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,i18npool,\ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index e21e7bb894af..64d5adbd65ae 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 688cc92992b1..d0849b236237 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Library_Library,index_data)) -$(eval $(call gb_Library_use_libraries,index_data,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index 36ce7d28f236..40d3ff25001f 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Library_Library,localedata_en)) -$(eval $(call gb_Library_use_libraries,localedata_en,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BW \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index ee55b8979b32..3e8e520f1bd4 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index caece13427bf..ee250c6afa92 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index b447d061c4d1..64106a1b02f3 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index fae27a1e9fd5..cebbb69c2d8e 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_set_include,textconv_dict,\ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ - $(gb_UWINAPI) \ sal \ cppu \ cppuhelper \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 4dcfbdda64da..2a255e41d2b2 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ comphelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,i18nutil,\ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 090bdd675517..98f447709a2c 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Executable_use_sdk_api,svidl)) $(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,svidl,\ diff --git a/include/sal/config.h b/include/sal/config.h index 3911db512d55..31c19a34a18b 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -43,11 +43,6 @@ #endif /* defined _MSC_VER */ -/* Provide ISO C99 compatible versions of snprint and vsnprintf */ -#ifndef _SNPRINTF_H -#include <systools/win32/snprintf.h> -#endif - #endif /* defined WIN32 */ #if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ diff --git a/include/systools/win32/snprintf.h b/include/systools/win32/snprintf.h deleted file mode 100644 index 94799d085e20..000000000000 --- a/include/systools/win32/snprintf.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H -#define INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H - -#if !defined(_WIN32) -#error ERROR: Only Win32 target supported! -#endif - -/* Macros for Unicode/ANSI support like in TCHAR.H */ - -#ifdef _UNICODE -#define sntprintf snwprintf -#define vsntprintf vsnwprintf -#else -#define sntprintf snprintf -#define vsntprintf vsnprintf -#endif - -/* Define needed types if they are not yet defined */ - - -# ifndef _VA_LIST_DEFINED - typedef char * va_list; -# define _VA_LIST_DEFINED -# endif - - -# ifndef _WCHAR_T_DEFINED - typedef unsigned short wchar_t; -# define _WCHAR_T_DEFINED -# endif - - -#ifndef LO_SNPRINTF_DLLIMPORT -#define LO_SNPRINTF_DLLIMPORT __declspec( dllimport ) -#endif - -#ifdef __cplusplus -extern "C" { -#endif - - -/* Implementations of snprintf following the ISO/IEC 9899:1999 (ISO C99) - standard. - The difference compared to _snprintf is that the buffer always is zero - terminated (unless count is zero) and the return value is the number of - characters (not including terminating zero) that would have been written - even if the buffer wasn't large - enough to hold the string. */ - -/* VS 2015 and above support ISO C snprintf */ -#if _MSC_VER < 1900 - -/* UNICODE version */ -LO_SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const wchar_t *format, ... ); - -/* SBCS and MBCS version */ -LO_SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... ); - -#endif - -/* Conflict with STL_port inline implementation */ - -#ifdef __cplusplus -} -#endif - -#endif // INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/io/Library_io.mk b/io/Library_io.mk index cfe879f5e155..c203daae2e78 100644 --- a/io/Library_io.mk +++ b/io/Library_io.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,io,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,io,io/source/io)) diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index 4cf51a5baac9..aa7a4f105c63 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\ $(eval $(call gb_Library_use_libraries,juh,\ sal \ - $(gb_UWINAPI) \ )) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index dde1e23ef80b..1a24e5ef54f2 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,juhx,\ jvmaccess \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,juhx,\ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index dbe0b8937a56..2e26df17e13d 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Library_Library,jpipe)) -$(eval $(call gb_Library_use_libraries,jpipe,\ - $(gb_UWINAPI) \ -)) - ifeq ($(OS),WNT) # The real library is called jpipx on Windows. We build only a wrapper diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index c04dba850e50..589d9c8eef36 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Library_Library,jpipx)) $(eval $(call gb_Library_use_libraries,jpipx,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_cobjects,jpipx,\ diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 7a15c7af5a4c..0a0fc2312e15 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ cppu \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 8848be154100..ab5ae8abe386 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Executable_Executable,javaldx)) $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,javaldx,\ diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index f3373b781b20..eede8f4503c3 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) ifeq ($(OS),ANDROID) diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk index ead598f965e5..d58923f45194 100644 --- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk +++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_external,libreofficekit_tiledrendering,boost_he # require any normal LO api/libraries. $(eval $(call gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \ sal \ - $(gb_UWINAPI) \ )) ifeq ($(OS),LINUX) diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index c8ee6ec026df..55f9225722a5 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,guesslang,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,guesslang,\ diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index 5ea6cd8c0355..6e771351de47 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_static_libraries,hyphen,\ diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index ea1430ce6e41..500e1c8eef19 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,lnth,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_static_libraries,lnth,\ diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 408eb72afc9c..e7d8a318271a 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,spell,\ sal \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_static_libraries,spell,\ diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index e3cba909bee5..d00f7637e52c 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,lng,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,lng,\ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 1a2bf5f7a4dd..3e45405d5f5e 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ test \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,lotuswordpro_test_lotuswordpro)) diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index f86e9dec5be6..7393590c9087 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ ucbhelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,lwpft,\ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 62a0fc985be2..55c1fee84a20 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_external,o3tl_tests,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk index d671752a5607..0acc081048da 100644 --- a/odk/CppunitTest_odk_checkapi.mk +++ b/odk/CppunitTest_odk_checkapi.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,odk_checkapi,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_external_code,odk_checkapi)) diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 3311af2e5ec6..2f67cc6f1897 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -9,8 +9,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/docs)) -odk_cpp_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \ - $(if $(filter WNT,$(OS)),systools) +odk_cpp_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper + odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \ com/sun/star/uno/Any.hxx \ com/sun/star/uno/genfunc.h \ diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk index 4b7590d1d66c..40e0fb83d0f8 100644 --- a/odk/Package_odk_headers.mk +++ b/odk/Package_odk_headers.mk @@ -167,7 +167,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\ salhelper/singletonref.hxx \ salhelper/thread.hxx \ salhelper/timer.hxx \ - systools/win32/snprintf.h \ typelib/typeclass.h \ typelib/typedescription.h \ typelib/typedescription.hxx \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index e9aaf44bc1e3..098145e1941a 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -9,10 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) -$(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_CppunitTest_use_custom_headers,officecfg_cppheader_test,\ officecfg/registry \ )) diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 1e903a25a368..1ef9d85bc625 100644 --- a/oox/CppunitTest_oox_tokenmap.mk +++ b/oox/CppunitTest_oox_tokenmap.mk @@ -57,7 +57,6 @@ $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\ vcl \ xo \ xmlscript \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/oox/CppunitTest_oox_vba_compression.mk b/oox/CppunitTest_oox_vba_compression.mk index 35d1d1510af2..14b6b8618a8d 100644 --- a/oox/CppunitTest_oox_vba_compression.mk +++ b/oox/CppunitTest_oox_vba_compression.mk @@ -41,7 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,oox_vba_compression,\ vcl \ xo \ xmlscript \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/oox/CppunitTest_oox_vba_encryption.mk b/oox/CppunitTest_oox_vba_encryption.mk index 1a588830a09e..ed625f2cc748 100644 --- a/oox/CppunitTest_oox_vba_encryption.mk +++ b/oox/CppunitTest_oox_vba_encryption.mk @@ -41,7 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,oox_vba_encryption,\ vcl \ xo \ xmlscript \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 3b4a6ac80744..632f09bf01ee 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,oox,\ vcl \ xo \ xmlscript \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,oox,\ diff --git a/package/CppunitTest_package2_test.mk b/package/CppunitTest_package2_test.mk index 4a9bff5fd853..546da10deda6 100644 --- a/package/CppunitTest_package2_test.mk +++ b/package/CppunitTest_package2_test.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,package2_test, \ sal \ tl \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,package2_test)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index f563d0a0c0cc..3096a976601f 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,package2,\ sal \ sax \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,package2,\ diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 29514321962e..0b8f0657f8f6 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,xstor,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xstor,\ diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk index daa98d9409a6..d886cb4961d8 100644 --- a/postprocess/CppunitTest_services.mk +++ b/postprocess/CppunitTest_services.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,services, \ test \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,services)) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index d765a26e466d..d17b1196990a 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_external,reg,boost_headers)) $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,reg,\ diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index 34d3d646dced..6c735102a7f8 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,uuresolver,\ diff --git a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk index 70b290f4cacf..7f0bccf2064a 100644 --- a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk +++ b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,reportdesign_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,reportdesign_dialogs_test,boost_headers)) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 46823fc0e63d..02fd8748d26c 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,rpt,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index e4c0f81f92ba..f4e24c0e2f53 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,rptui,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index f99ae3201906..af68c0f60511 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml)) diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 970550ed2f1e..06b119805d10 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ i18nlangtag \ tl \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_use_externals,rsc,\ diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index 637159992fb8..a00429de30d8 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk index 7432ff9a1c36..d96ab2d41483 100644 --- a/sal/CppunitTest_sal_osl.mk +++ b/sal/CppunitTest_sal_osl.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl,\ sal \ - $(gb_UWINAPI) \ )) # the test uses the library created by Module_DLL diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index 6c75b7ca5dc3..0a0905c00734 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk index b69e330a87a6..43533fc5ab1c 100644 --- a/sal/CppunitTest_sal_rtl.mk +++ b/sal/CppunitTest_sal_rtl.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sal_rtl,\ diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 20a7c7240707..487d2f9a28a4 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index f851c4d61083..509196b25ecd 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Executable_set_include,cppunittester,\ $(eval $(call gb_Executable_use_libraries,cppunittester,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_use_externals,cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index bbac3a54afa3..f64f9460541f 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Executable_Executable,osl_process_child)) $(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 4c047070df9d..0a2ccc4cf4cb 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,sal,\ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 331b465434fd..15546ba4969e 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Library_use_external,sal_textenc,boost_headers)) $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,sal_textenc,\ diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk deleted file mode 100644 index e9a00ab47551..000000000000 --- a/sal/Library_uwinapi.mk +++ /dev/null @@ -1,48 +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/. -# - -$(eval $(call gb_Library_Library,uwinapi)) - -$(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ - $(if $(filter $(COM),MSC), \ - kernel32 \ - msvcrt \ - shlwapi \ - user32 \ - version \ - ) \ -)) - -$(eval $(call gb_Library_add_defs,uwinapi,\ - $(if $(filter $(COM),GCC), \ - -Wno-unused-parameter -Wno-return-type) \ -)) - -$(eval $(call gb_Library_add_cobjects,uwinapi,\ - sal/systools/win32/uwinapi/snprintf \ - sal/systools/win32/uwinapi/snwprintf \ -)) - -ifeq ($(COM),MSC) - -$(eval $(call gb_Library_add_cobjects,uwinapi,\ - sal/systools/win32/uwinapi/legacy \ -)) - -ifeq ($(VCVER),120) -$(eval $(call gb_Library_add_ldflags,uwinapi,\ - /DEF:$(SRCDIR)/sal/systools/win32/uwinapi/uwinapi.def \ -)) -endif - -endif - - -# vim: set noet sw=4 ts=4: diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 3a40ed75105b..fe9523a7a6e2 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -15,8 +15,6 @@ $(eval $(call gb_Module_add_targets,sal,\ Library_lo-bootstrap) \ Library_sal \ $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Library_sal_textenc)) \ - $(if $(filter $(OS),WNT), \ - Library_uwinapi) \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/sal/systools/win32/uwinapi/legacy.c b/sal/systools/win32/uwinapi/legacy.c deleted file mode 100644 index e88c7524ed22..000000000000 --- a/sal/systools/win32/uwinapi/legacy.c +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#ifdef _MSC_VER -#pragma warning(disable:4273) // inconsistent dll linkage -#endif - -#if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || defined __clang__ -// older versions use uwinapi.def file for export -__declspec(dllexport) -#endif -DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR lpszShortPath,DWORD cchBuffer) -{ - typedef DWORD (WINAPI * GetShortPathNameW_t) (LPCWSTR,LPWSTR,DWORD); - - GetShortPathNameW_t p_GetShortPathNameW = - (GetShortPathNameW_t) GetProcAddress ( - GetModuleHandle ("kernel32.dll"), "GetShortPathNameW"); - - if (p_GetShortPathNameW) - return p_GetShortPathNameW(lpszLongPath,lpszShortPath,cchBuffer); - else - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/snprintf.c b/sal/systools/win32/uwinapi/snprintf.c deleted file mode 100644 index de927644404e..000000000000 --- a/sal/systools/win32/uwinapi/snprintf.c +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -/* Not unicode */ -#undef _UNICODE - -/* Support MBCS and SBCS */ - -#ifndef _MBCS -#define _MBCS -#endif - -#include "sntprintf.c" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c deleted file mode 100644 index 22ce4f7d3050..000000000000 --- a/sal/systools/win32/uwinapi/sntprintf.c +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#define LO_SNPRINTF_DLLIMPORT __declspec( dllexport ) - -#include <stdarg.h> -#include <stdio.h> - -#include <tchar.h> -#include <systools/win32/snprintf.h> - -#ifdef _MSC_VER -#pragma warning(disable:4273) // inconsistent dll linkage -#endif - -/* VS 2015 and above support ISO C snprintf */ -#if _MSC_VER < 1900 - -/* This function retrieves the pointer to the last character of a buffer. - That is the pointer to the last character of the buffer that fits - completely into that buffer or the position of the terminating zero. - - buffer Pointer to a _TXCHAR buffer to be examined - count size of the buffer to be examined - - return The pointer to the last character that fits into the buffer or - NULL if count is zero or count is one and the first byte was a - leading DBCS character -*/ - -static _TCHAR *GetLastBufferChar( _TCHAR *buffer, size_t count ) -{ - _TCHAR *last = NULL; - _TCHAR *cur = buffer; - - while ( (size_t)(cur - buffer) < count ) - { - last = cur; - - if ( !*last ) - break; - - cur = _tcsinc(last); - } - - return last; -} - - -/* Implementation of snprintf following the ISO/IEC 9899:1999 (ISO C99) standard */ - -LO_SNPRINTF_DLLIMPORT int __cdecl vsntprintf( _TCHAR *buffer, size_t count, const _TCHAR *format, va_list list ) -{ - int retval; - - /* First of all call the existing non POSIX standard function assuming - the buffer size will be large enough */ - - retval = _vsntprintf( buffer, count, format, list ); - - if ( retval < 0 ) - { - /* If the buffer wasn't large enough ensure that the buffer will be - zero terminated */ - - _TCHAR *last = GetLastBufferChar( buffer, count ); - if (last ) - *last = 0; - - /* Retrieve the count of characters that would have been written - if the buffer were large enough */ - - retval = _vsctprintf( format, list ); - } - else if ( (size_t)retval == count && count ) - { - /* If the buffer was large enough but not large enough for the trailing - zero make the buffer zero terminated */ - - _TCHAR *last = GetLastBufferChar( buffer, count ); - if (last ) - *last = 0; - } - - return retval; -} - -/* Implementation of snprintf following the ISO/IEC 9899:1999 (ISO C99) standard */ - -LO_SNPRINTF_DLLIMPORT int __cdecl sntprintf( _TCHAR *buffer, size_t count, const _TCHAR *format, ... ) -{ - va_list list; - int retval; - - va_start( list, format ); - retval = vsntprintf( buffer, count, format, list ); - va_end( list ); - - return retval; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/snwprintf.c b/sal/systools/win32/uwinapi/snwprintf.c deleted file mode 100644 index cd076ae5795a..000000000000 --- a/sal/systools/win32/uwinapi/snwprintf.c +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef _UNICODE -#define _UNICODE -#endif - -#include "sntprintf.c" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/uwinapi.def b/sal/systools/win32/uwinapi/uwinapi.def deleted file mode 100644 index f740fb1c160c..000000000000 --- a/sal/systools/win32/uwinapi/uwinapi.def +++ /dev/null @@ -1,8 +0,0 @@ -LIBRARY "uwinapi.dll" - -EXPORTS - GetShortPathNameW PRIVATE - snprintf - snwprintf - vsnprintf - vsnwprintf diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk index bea1cf1fda51..f3d98aa435bd 100644 --- a/salhelper/CppunitTest_salhelper_testapi.mk +++ b/salhelper/CppunitTest_salhelper_testapi.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_external,salhelper_testapi,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\ salhelper \ sal \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index aa673b28429f..a97666dafe2f 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Library_add_defs,salhelper,\ $(eval $(call gb_Library_use_libraries,salhelper,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,salhelper,\ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index d3108d59af9f..652695cc9732 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax, \ sal \ comphelper \ cppu \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,sax, \ diff --git a/sax/CppunitTest_sax_attributes.mk b/sax/CppunitTest_sax_attributes.mk index c700ae4c4b77..020ccc21436e 100644 --- a/sax/CppunitTest_sax_attributes.mk +++ b/sax/CppunitTest_sax_attributes.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_attributes, \ cppuhelper \ sal \ sax \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,sax_attributes)) diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index f94d7b0ff4fa..eafad95a06a2 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ expwrap \ sal \ test \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sax_parser, \ diff --git a/sax/CppunitTest_sax_xmlimport.mk b/sax/CppunitTest_sax_xmlimport.mk index 80263316ba1d..b8cc56dbb311 100644 --- a/sax/CppunitTest_sax_xmlimport.mk +++ b/sax/CppunitTest_sax_xmlimport.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_xmlimport, \ unotest \ utl \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,sax_xmlimport,\ diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 6b38278982e9..076814aab0e8 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ sal \ salhelper \ sax \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,expwrap,\ diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 353c5c6bc753..d4149d382b66 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,sax,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_defs,sax,\ diff --git a/sc/CppunitTest_sc_addin_functions_test.mk b/sc/CppunitTest_sc_addin_functions_test.mk index 245c94b82b04..b1aa766679be 100644 --- a/sc/CppunitTest_sc_addin_functions_test.mk +++ b/sc/CppunitTest_sc_addin_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_addin_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_addin_functions_test,\ diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk index 8af40604ed84..2f9719e48fd6 100644 --- a/sc/CppunitTest_sc_anchor_test.mk +++ b/sc/CppunitTest_sc_anchor_test.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_anchor_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_anchor_test,\ diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index c2b8e7d4beb3..7dbd3c377330 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_annotationobj,\ diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index b2bbd9de618c..eb720ce0bcb4 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationshapeobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_annotationshapeobj,\ diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index 6cca3089ae02..e606242f9fa2 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_annotationsobj,\ diff --git a/sc/CppunitTest_sc_array_functions_test.mk b/sc/CppunitTest_sc_array_functions_test.mk index cff986e37fc6..c94b75a7b203 100644 --- a/sc/CppunitTest_sc_array_functions_test.mk +++ b/sc/CppunitTest_sc_array_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_array_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_array_functions_test,\ diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk index 65896590edc8..d14a9e1154da 100644 --- a/sc/CppunitTest_sc_bugfix_test.mk +++ b/sc/CppunitTest_sc_bugfix_test.mk @@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_bugfix_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_bugfix_test,\ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index da6c5773f4be..16fd329ae6fe 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_cellrangeobj,\ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 003b7c71846b..1a00137c0a85 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -46,7 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ diff --git a/sc/CppunitTest_sc_check_data_pilot_field.mk b/sc/CppunitTest_sc_check_data_pilot_field.mk index 6f1e631a81cf..59825d028bd9 100644 --- a/sc/CppunitTest_sc_check_data_pilot_field.mk +++ b/sc/CppunitTest_sc_check_data_pilot_field.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_check_data_pilot_field, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_check_data_pilot_field,\ diff --git a/sc/CppunitTest_sc_check_data_pilot_table.mk b/sc/CppunitTest_sc_check_data_pilot_table.mk index e536dfeb92fd..9f3f4209604d 100644 --- a/sc/CppunitTest_sc_check_data_pilot_table.mk +++ b/sc/CppunitTest_sc_check_data_pilot_table.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_check_data_pilot_table, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_check_data_pilot_table,\ diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk b/sc/CppunitTest_sc_check_xcell_ranges_query.mk index afbd184ac240..33c448dbebf1 100644 --- a/sc/CppunitTest_sc_check_xcell_ranges_query.mk +++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_check_xcell_ranges_query, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_check_xcell_ranges_query,\ diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk index a31478fe985e..f88d6b264674 100644 --- a/sc/CppunitTest_sc_condformats.mk +++ b/sc/CppunitTest_sc_condformats.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_condformats, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_condformats,\ diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk index 4920c80ae77d..8d71cf6004cf 100644 --- a/sc/CppunitTest_sc_copypaste.mk +++ b/sc/CppunitTest_sc_copypaste.mk @@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_copypaste,\ diff --git a/sc/CppunitTest_sc_database_functions_test.mk b/sc/CppunitTest_sc_database_functions_test.mk index 4596080dfe31..8b9b9ac83625 100644 --- a/sc/CppunitTest_sc_database_functions_test.mk +++ b/sc/CppunitTest_sc_database_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_database_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_database_functions_test,\ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 71e12b6c064b..528829687311 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 736cd5458578..1377f6615f5a 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 4f5026609836..ea953602add4 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ diff --git a/sc/CppunitTest_sc_datetime_functions_test.mk b/sc/CppunitTest_sc_datetime_functions_test.mk index 138ff3a1eaa0..560ae910f684 100644 --- a/sc/CppunitTest_sc_datetime_functions_test.mk +++ b/sc/CppunitTest_sc_datetime_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datetime_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_datetime_functions_test,\ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index c7395eea6691..04914a43fac1 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 5097f4f8f74f..ce1e529bc285 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index ed575a0bc32e..0821f2753a42 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ diff --git a/sc/CppunitTest_sc_financial_functions_test.mk b/sc/CppunitTest_sc_financial_functions_test.mk index 5bf97a751baf..748c44b879b8 100644 --- a/sc/CppunitTest_sc_financial_functions_test.mk +++ b/sc/CppunitTest_sc_financial_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_financial_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_financial_functions_test,\ diff --git a/sc/CppunitTest_sc_functions_test_old.mk b/sc/CppunitTest_sc_functions_test_old.mk index 2981bf87b8fb..cad0a6acf1bc 100644 --- a/sc/CppunitTest_sc_functions_test_old.mk +++ b/sc/CppunitTest_sc_functions_test_old.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_functions_test_old, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_functions_test_old,\ diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk index c3fa3abe8c5e..08e7d04d4bf1 100644 --- a/sc/CppunitTest_sc_html_export_test.mk +++ b/sc/CppunitTest_sc_html_export_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_html_export_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_html_export_test,\ diff --git a/sc/CppunitTest_sc_information_functions_test.mk b/sc/CppunitTest_sc_information_functions_test.mk index 4741322e51af..1c476bd6ac3b 100644 --- a/sc/CppunitTest_sc_information_functions_test.mk +++ b/sc/CppunitTest_sc_information_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_information_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_information_functions_test,\ diff --git a/sc/CppunitTest_sc_logical_functions_test.mk b/sc/CppunitTest_sc_logical_functions_test.mk index af9a5a3bf5c6..ec2d07ea5f80 100644 --- a/sc/CppunitTest_sc_logical_functions_test.mk +++ b/sc/CppunitTest_sc_logical_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_logical_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_logical_functions_test,\ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 8e241681ce57..dd979d6b8486 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ diff --git a/sc/CppunitTest_sc_mark_test.mk b/sc/CppunitTest_sc_mark_test.mk index bd4bf3dfab13..a37367b1d092 100644 --- a/sc/CppunitTest_sc_mark_test.mk +++ b/sc/CppunitTest_sc_mark_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mark_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_mark_test,\ diff --git a/sc/CppunitTest_sc_mathematical_functions_test.mk b/sc/CppunitTest_sc_mathematical_functions_test.mk index 672bf5cb4226..94e84e759edb 100644 --- a/sc/CppunitTest_sc_mathematical_functions_test.mk +++ b/sc/CppunitTest_sc_mathematical_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mathematical_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_mathematical_functions_test,\ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 6f045f48ea14..d8ce3c528ad8 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 8fa8de50a96c..3b68504ac429 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index c6ad37158e7b..49d5f43f9f54 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk index 2ffdd2681a32..8997b907e0f6 100644 --- a/sc/CppunitTest_sc_new_cond_format_api.mk +++ b/sc/CppunitTest_sc_new_cond_format_api.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_new_cond_format_api, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_new_cond_format_api,\ diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index ff0532e73ce6..6abc275ec991 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_opencl_test,\ diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index 0a256f63695b..6822d9f2b0ba 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_outlineobj,\ diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk index c3e02686d16b..a59ac83bf02e 100644 --- a/sc/CppunitTest_sc_perfobj.mk +++ b/sc/CppunitTest_sc_perfobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_perfobj,\ diff --git a/sc/CppunitTest_sc_range_test.mk b/sc/CppunitTest_sc_range_test.mk index 0fdbd3c08fb5..9405142caa13 100644 --- a/sc/CppunitTest_sc_range_test.mk +++ b/sc/CppunitTest_sc_range_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_range_test,\ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index fa6f690e425c..b348105af8be 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ diff --git a/sc/CppunitTest_sc_recordchanges.mk b/sc/CppunitTest_sc_recordchanges.mk index 9fddf38c1f9b..e64f39a70afe 100644 --- a/sc/CppunitTest_sc_recordchanges.mk +++ b/sc/CppunitTest_sc_recordchanges.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_recordchanges, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_recordchanges,\ diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk index 0c0123a1824c..fde5d149cdb3 100644 --- a/sc/CppunitTest_sc_screenshots.mk +++ b/sc/CppunitTest_sc_screenshots.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_screenshots, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sc_screenshots,\ diff --git a/sc/CppunitTest_sc_spreadsheet_functions_test.mk b/sc/CppunitTest_sc_spreadsheet_functions_test.mk index dee36b2afea8..6049862d5782 100644 --- a/sc/CppunitTest_sc_spreadsheet_functions_test.mk +++ b/sc/CppunitTest_sc_spreadsheet_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheet_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_spreadsheet_functions_test,\ diff --git a/sc/CppunitTest_sc_statistical_functions_test.mk b/sc/CppunitTest_sc_statistical_functions_test.mk index 4ec0561da657..931c0b22ad86 100644 --- a/sc/CppunitTest_sc_statistical_functions_test.mk +++ b/sc/CppunitTest_sc_statistical_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_statistical_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_statistical_functions_test,\ diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk index 9b3daa503b08..3a644acc5607 100644 --- a/sc/CppunitTest_sc_styleloaderobj.mk +++ b/sc/CppunitTest_sc_styleloaderobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_styleloaderobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_styleloaderobj,\ diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 453314cb04bc..b97423e27f89 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_subsequent_export_test,\ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index b1537df1d0e5..ea835c8aea02 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 707cc87f167c..ef212c33574f 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_tablesheetobj,\ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 0dce9d43105b..334058881200 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_tablesheetsobj,\ diff --git a/sc/CppunitTest_sc_text_functions_test.mk b/sc/CppunitTest_sc_text_functions_test.mk index 6f4131ce04fc..956b2b9d5aa1 100644 --- a/sc/CppunitTest_sc_text_functions_test.mk +++ b/sc/CppunitTest_sc_text_functions_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_text_functions_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_text_functions_test,\ diff --git a/sc/CppunitTest_sc_tiledrendering.mk b/sc/CppunitTest_sc_tiledrendering.mk index fb86e258ba6e..3926e5fdcd23 100644 --- a/sc/CppunitTest_sc_tiledrendering.mk +++ b/sc/CppunitTest_sc_tiledrendering.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tiledrendering, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sc_tiledrendering,\ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 247279bf46ce..5e91862f416c 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -72,7 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ diff --git a/sc/CppunitTest_sc_viewpaneobj.mk b/sc/CppunitTest_sc_viewpaneobj.mk index cde890cdd15f..e1a7a2c21ffb 100644 --- a/sc/CppunitTest_sc_viewpaneobj.mk +++ b/sc/CppunitTest_sc_viewpaneobj.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_viewpaneobj, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sc_viewpaneobj,\ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index c9e1d0a13f11..99c66b78af47 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -84,7 +84,6 @@ $(eval $(call gb_Library_use_libraries,sc,\ vbahelper) \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,sc,\ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index efd1be364b90..1b491afc5cd8 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,scd,\ sot \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,scd,\ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8abfd870c4de..e7d91bff580c 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ utl \ vcl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,scfilt,\ diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk index 767ef7a9e714..0e209024b398 100644 --- a/sc/Library_scqahelper.mk +++ b/sc/Library_scqahelper.mk @@ -55,7 +55,6 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\ ucbhelper \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,scqahelper,\ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 4b911d6846b1..2f2a5d6ac6d1 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,scui,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,scui,\ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 92d3e06d024f..36b4d7e39d91 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ utl \ vbahelper \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,vbaobj,\ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index cafce60604a7..1185c4dd3683 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,analysis,\ sal \ tl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,analysis,\ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index dbe1b9901219..dbc76688bc9d 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,date,\ sal \ tl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,date,\ diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk index f2fbeca7f169..ea12d2fdb7b6 100644 --- a/scaddins/Library_pricing.mk +++ b/scaddins/Library_pricing.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,pricing,\ sal \ tl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,pricing,\ diff --git a/sccomp/CppunitTest_sccomp_lpsolver.mk b/sccomp/CppunitTest_sccomp_lpsolver.mk index e7ec230d3872..4b664d15bf18 100644 --- a/sccomp/CppunitTest_sccomp_lpsolver.mk +++ b/sccomp/CppunitTest_sccomp_lpsolver.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sccomp_lpsolver,\ sal \ test \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sccomp_lpsolver,\ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 450728805998..b79d8d2f2c33 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,solver,\ sal \ tl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,solver,\ diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 160e73e25c91..9b534a3f27fd 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -18,25 +18,6 @@ #include "macros.inc" -#if defined(WITH_VC120_REDIST) - -#if defined WINDOWS_X64 -MergeModule gid_MergeModule_Microsoft_VC120_CRT_x64 -#else -MergeModule gid_MergeModule_Microsoft_VC120_CRT_x86 -#endif - Feature = gm_Root; -#if defined WINDOWS_X64 - Name = "Microsoft_VC120_CRT_x64.msm"; -#else - Name = "Microsoft_VC120_CRT_x86.msm"; -#endif - RootDir = "TARGETDIR"; - ComponentCondition = "VC_REDIST=1"; -End - -#endif - #if defined(WITH_VC140_REDIST) #if defined WINDOWS_X64 diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 7567896b4b9f..45fc586e353e 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -23,65 +23,17 @@ Directory gid_Dir_Shlxthdl DosName = "shlxthdl"; End -#ifdef BUILD_X64 - -#if defined(WITH_VC100_REDIST) - -File gid_File_Lib_Msvcr100 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcr100.dll"; - ComponentCondition = "VersionNT64"; -End - -File gid_File_Lib_Msvcp100 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcp100.dll"; - ComponentCondition = "VersionNT64"; -End - -#endif - -#if defined(WITH_VC110_REDIST) +/* + * TODO(davido): Probably the redists need to be included for the supported compilers + */ -File gid_File_Lib_Msvcr110 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcr110.dll"; - ComponentCondition = "VersionNT64"; -End +#ifdef BUILD_X64 -File gid_File_Lib_Msvcp110 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcp110.dll"; - ComponentCondition = "VersionNT64"; -End +#if defined(WITH_VC140_REDIST) #endif -#if defined(WITH_VC120_REDIST) - -File gid_File_Lib_Msvcr120 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcr120.dll"; - ComponentCondition = "VersionNT64"; -End - -File gid_File_Lib_Msvcp120 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcp120.dll"; - ComponentCondition = "VersionNT64"; -End +#if defined(WITH_VC150_REDIST) #endif diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 6e2fb2dda2c9..473dee22371f 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,basprov,\ tl \ ucbhelper \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,basprov,\ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 061d0c91ed35..02ea01118d0f 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ vbahelper \ vcl \ xmlscript \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,dlgprov,\ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index 4134c2a55be8..e140bb322008 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ sal \ sfx \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,protocolhandler,\ diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 4be448ddc8eb..31057f9c111f 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ tl \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,scriptframe,\ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index c70a054d1bc6..08b8c6131122 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ sal \ tl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,stringresource,\ diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 482ffbb88917..712cfb68229b 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ sfx \ sb \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,vbaevents,\ diff --git a/sd/CppunitTest_sd_dialogs_test.mk b/sd/CppunitTest_sd_dialogs_test.mk index 0196d95befa5..3f01d92f2509 100644 --- a/sd/CppunitTest_sd_dialogs_test.mk +++ b/sd/CppunitTest_sd_dialogs_test.mk @@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,sd_dialogs_test,boost_headers)) diff --git a/sd/CppunitTest_sd_export_ooxml1.mk b/sd/CppunitTest_sd_export_ooxml1.mk index 9009de03b1bb..cd0a24c121de 100644 --- a/sd/CppunitTest_sd_export_ooxml1.mk +++ b/sd/CppunitTest_sd_export_ooxml1.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_export_ooxml1, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_export_ooxml1,\ diff --git a/sd/CppunitTest_sd_export_ooxml2.mk b/sd/CppunitTest_sd_export_ooxml2.mk index 143cd60af498..dd83f86eed15 100644 --- a/sd/CppunitTest_sd_export_ooxml2.mk +++ b/sd/CppunitTest_sd_export_ooxml2.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_export_ooxml2, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_export_ooxml2,\ diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk index dc0573eb07d0..4a6c8a979213 100644 --- a/sd/CppunitTest_sd_export_tests.mk +++ b/sd/CppunitTest_sd_export_tests.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_export_tests, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_export_tests,\ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index e206b150274d..413cee44438b 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -52,7 +52,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index ea21eb6d733a..17aa7855f3a6 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_html_export_tests, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_html_export_tests,\ diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index ea175d02102d..61ea93871bd0 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_import_tests, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_import_tests,\ diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk index e576285a00d5..8e6b278c771b 100644 --- a/sd/CppunitTest_sd_misc_tests.mk +++ b/sd/CppunitTest_sd_misc_tests.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_misc_tests, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_misc_tests,\ diff --git a/sd/CppunitTest_sd_svg_export_tests.mk b/sd/CppunitTest_sd_svg_export_tests.mk index 0221ab0e07b6..62b97ad1f52a 100644 --- a/sd/CppunitTest_sd_svg_export_tests.mk +++ b/sd/CppunitTest_sd_svg_export_tests.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_svg_export_tests, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sd_svg_export_tests,\ diff --git a/sd/CppunitTest_sd_tiledrendering.mk b/sd/CppunitTest_sd_tiledrendering.mk index 711f6eb2ac49..495eeed9d2b2 100644 --- a/sd/CppunitTest_sd_tiledrendering.mk +++ b/sd/CppunitTest_sd_tiledrendering.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_tiledrendering, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sd_tiledrendering,\ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index b17e71c81e43..627876f21822 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 184cb8baa892..99bd496e0e3f 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -95,7 +95,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ utl \ vcl \ $(if $(ENABLE_NSS),xmlsecurity) \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,sd,\ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index cfabf2218b53..65359113d565 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,sdd,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd)) diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 028226924c6a..de9d938809c0 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt)) diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 86c72727d803..b928144145a2 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -59,7 +59,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,sdui,\ diff --git a/sdext/CppunitTest_sdext_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk index 2642786e0385..83f3131fe40e 100644 --- a/sdext/CppunitTest_sdext_pdfimport.mk +++ b/sdext/CppunitTest_sdext_pdfimport.mk @@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ sal \ test \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_library_objects,sdext_pdfimport,pdfimport)) diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index 6589f7852e3d..dde84963a1fb 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -16,10 +16,6 @@ $(eval $(call gb_Executable_use_externals,xpdfimport,\ zlib \ )) -$(eval $(call gb_Executable_use_libraries,xpdfimport,\ - $(gb_UWINAPI) \ -)) - $(eval $(call gb_Executable_add_exception_objects,xpdfimport,\ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl \ sdext/source/pdfimport/xpdfwrapper/pnghelper \ diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk index 770f80f7453c..4d0ae63679f3 100644 --- a/setup_native/Library_instooofiltmsi.mk +++ b/setup_native/Library_instooofiltmsi.mk @@ -29,8 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\ $(eval $(call gb_Library_use_system_win32_libs,instooofiltmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ kernel32 \ )) diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk index 8aa88685884b..f958534f07b1 100644 --- a/setup_native/Library_qslnkmsi.mk +++ b/setup_native/Library_qslnkmsi.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,qslnkmsi,\ $(eval $(call gb_Library_use_system_win32_libs,qslnkmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk index 64aa20f42691..f20fa5ad5aea 100644 --- a/setup_native/Library_reg4allmsdoc.mk +++ b/setup_native/Library_reg4allmsdoc.mk @@ -31,8 +31,8 @@ $(eval $(call gb_Library_add_exception_objects,reg4allmsdoc,\ $(eval $(call gb_Library_use_system_win32_libs,reg4allmsdoc,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk index 3d0a51e0338a..7142b8ee0a7d 100644 --- a/setup_native/Library_regactivex.mk +++ b/setup_native/Library_regactivex.mk @@ -29,8 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,regactivex,\ $(eval $(call gb_Library_use_system_win32_libs,regactivex,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ kernel32 \ msi \ )) diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk index 2f29e16ecbcc..ff9a1bd586a7 100644 --- a/setup_native/Library_sdqsmsi.mk +++ b/setup_native/Library_sdqsmsi.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sdqsmsi,\ $(eval $(call gb_Library_use_system_win32_libs,sdqsmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index 60d4e95a65ff..04f8f6edbc46 100644 --- a/setup_native/Library_sellangmsi.mk +++ b/setup_native/Library_sellangmsi.mk @@ -34,8 +34,8 @@ $(eval $(call gb_Library_add_exception_objects,sellangmsi,\ $(eval $(call gb_Library_use_system_win32_libs,sellangmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk index fd0f0899f445..e6780d014b5f 100644 --- a/setup_native/Library_shlxtmsi.mk +++ b/setup_native/Library_shlxtmsi.mk @@ -43,8 +43,8 @@ $(eval $(call gb_Library_use_static_libraries,shlxtmsi,\ $(eval $(call gb_Library_use_system_win32_libs,shlxtmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ advapi32 \ diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk index 68aeeedcab99..aa94f2ebcf02 100644 --- a/setup_native/Library_sn_tools.mk +++ b/setup_native/Library_sn_tools.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sn_tools,\ $(eval $(call gb_Library_use_system_win32_libs,sn_tools,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ kernel32 \ msi \ advapi32 \ diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk index a96a35afc483..266253c4c9fb 100644 --- a/sfx2/CppunitTest_sfx2_classification.mk +++ b/sfx2/CppunitTest_sfx2_classification.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_classification, \ vcl \ sal \ sfx \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,sfx2_classification,boost_headers)) diff --git a/sfx2/CppunitTest_sfx2_controlleritem.mk b/sfx2/CppunitTest_sfx2_controlleritem.mk index 926719b8d5ad..f81ac133055b 100644 --- a/sfx2/CppunitTest_sfx2_controlleritem.mk +++ b/sfx2/CppunitTest_sfx2_controlleritem.mk @@ -20,7 +20,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_controlleritem, \ cppuhelper \ sal \ sfx \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/sfx2/CppunitTest_sfx2_dialogs_test.mk b/sfx2/CppunitTest_sfx2_dialogs_test.mk index 50d92d3d9a85..88646565d8de 100644 --- a/sfx2/CppunitTest_sfx2_dialogs_test.mk +++ b/sfx2/CppunitTest_sfx2_dialogs_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,sfx2_dialogs_test,boost_headers)) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index d02a6441a283..7e6d8889a66a 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ cppuhelper \ sal \ sfx \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,sfx2_metadatable,boost_headers)) diff --git a/sfx2/Library_qstart_gtk.mk b/sfx2/Library_qstart_gtk.mk index a16dbd3faf75..82a23111eaa6 100644 --- a/sfx2/Library_qstart_gtk.mk +++ b/sfx2/Library_qstart_gtk.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ utl \ vcl \ sfx \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,qstart_gtk,\ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index f0a5a52c0cc2..2ad775dcc162 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -73,7 +73,6 @@ $(eval $(call gb_Library_use_libraries,sfx,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,sfx,\ diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index e3ca7e6a4566..55b4c33c41f5 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ i18nlangtag \ sal \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 2bba4d432a72..49d76f72484b 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index edd09d996634..7dc32ba47733 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index bc0d29043b77..7c4931b2ce39 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index 41b402260374..5cd46b307124 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_externals,recentfile,\ $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_static_libraries,recentfile,\ diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 17ee516c5b77..c36056a9536b 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_libraries,syssh,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index 499ac082cc1e..080323ea1100 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 8200eb601c5b..f30c474ccbad 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -43,7 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index d46e47f759c8..faee8167a2e5 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ tl \ ucbhelper \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,demoshow,\ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index c7908b666863..4eca2a1ecaa3 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ cppuhelper \ sal \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,OGLTrans,\ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 0583f5e5f10a..346d5b3a7b0c 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index 4ba29eef20da..e16c95073976 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -13,10 +13,6 @@ $(eval $(call gb_Executable_set_include,libtest,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_use_libraries,libtest,\ - $(gb_UWINAPI) \ -)) - ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_libs,libtest,\ -ldl \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2c718ac544f9..1f3caec82141 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -178,8 +178,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(LIBRARY_X64)), \ -LIBPATH:$(COMPATH)/lib/$(if $(filter 140,$(VCVER)),amd64,x64) \ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ - $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64) \ - $(if $(filter-out 120,$(VCVER)),-LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64)) \ + -LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64 \ + $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64)) \ $(T_LDFLAGS) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 6dbb38127975..f79432793999 100755 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -151,11 +151,13 @@ gb_CFLAGS := \ -wd4512 \ -wd4706 \ -wd4800 \ + -wd4267 \ ifneq ($(COM_IS_CLANG),TRUE) +# clang-cl doesn't suport -Wv:18 for now gb_CFLAGS += \ - $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \ + -Wv:18 \ endif @@ -176,6 +178,7 @@ gb_CXXFLAGS := \ -wd4244 \ -wd4250 \ -wd4251 \ + -wd4267 \ -wd4275 \ -wd4290 \ -wd4351 \ @@ -188,12 +191,7 @@ gb_CXXFLAGS := \ -wd4706 \ -wd4800 \ -ifeq ($(CPUNAME),X86_64) - -gb_CXXFLAGS += \ - -wd4267 \ - -else +ifeq ($(CPUNAME),INTEL) gb_CXXFLAGS += \ -Zm500 \ @@ -206,7 +204,7 @@ endif ifneq ($(COM_IS_CLANG),TRUE) gb_CXXFLAGS += \ - $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \ + -Wv:18 \ endif @@ -276,7 +274,8 @@ gb_CXXCLRFLAGS := $(gb_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -EHa \ -clr \ -wd4339 \ - $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \ + -Wv:18 \ + -wd4267 \ ifeq ($(COM_IS_CLANG),TRUE) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 7be5eca7d4f8..e636de1c648d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -35,15 +35,6 @@ gb_OSDEFS := \ -DNOMINMAX \ $(LFS_CFLAGS) \ - -gb_UWINAPI := - -ifeq ($(VCVER),120) - -gb_UWINAPI := uwinapi - -endif - gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index c2e26e7b40fa..7fb75975f1b4 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ sot \ tl \ unotest \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,sot_test_sot,)) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 6c7655561b06..78d8c973bd39 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,sot,\ tl \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,sot,\ diff --git a/starmath/CppunitTest_starmath_dialogs_test.mk b/starmath/CppunitTest_starmath_dialogs_test.mk index 2f96dc546d66..ad091bc6ff7a 100644 --- a/starmath/CppunitTest_starmath_dialogs_test.mk +++ b/starmath/CppunitTest_starmath_dialogs_test.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,starmath_dialogs_test,boost_headers)) diff --git a/starmath/CppunitTest_starmath_export.mk b/starmath/CppunitTest_starmath_export.mk index 1dffe4554927..3ea437c20aa1 100644 --- a/starmath/CppunitTest_starmath_export.mk +++ b/starmath/CppunitTest_starmath_export.mk @@ -53,7 +53,6 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_export,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,starmath_export)) diff --git a/starmath/CppunitTest_starmath_import.mk b/starmath/CppunitTest_starmath_import.mk index 9397aabfc074..2bbda9c70d92 100644 --- a/starmath/CppunitTest_starmath_import.mk +++ b/starmath/CppunitTest_starmath_import.mk @@ -50,7 +50,6 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_import,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,starmath_import)) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index f2e3a6c1b991..19beb8c3eebd 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -46,7 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index d9c2d6d56da1..831bf0e648a5 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -59,7 +59,6 @@ $(eval $(call gb_Library_use_libraries,sm,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,sm,\ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 15bff615414c..481069dd716a 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,smd,\ sot \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,smd,\ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 1080cc95e431..bf5a75f55b6c 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ reg \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index a91ebd777571..b12465d75be7 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_libraries,introspection,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 9e6f729312d4..93f748893c09 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index 8243ec7fd22b..42f17556433c 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index cce32f8277e8..f0b11fb4a9dc 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ jvmaccess \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index fc4428deff3e..84e29e8556e0 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,javavm,\ jvmfwk \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 341c6ed22e5f..ace77b7e92cd 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index d24f7a238422..cf95b717281e 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index dfe1fb7c0638..442c5ec6e581 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index aa71d9e6403f..970ce9c8ad11 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_external,stocservices,boost_headers)) diff --git a/store/Library_store.mk b/store/Library_store.mk index ab0d02589608..fe90755e6ba3 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_use_libraries,store,\ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,store,\ diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk index 51948b23a746..24933397d7d3 100644 --- a/svgio/CppunitTest_svgio.mk +++ b/svgio/CppunitTest_svgio.mk @@ -40,7 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio,\ unotest \ tl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,svgio,\ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index 6769f671e855..377ce7fb67fc 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -20,7 +20,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ sal \ salhelper \ svl \ - $(gb_UWINAPI) \ )) ifeq ($(OS),WNT) diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index d7e10fc0aa56..42b740b7f640 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ svl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 5ee77d176957..4d2c3fbc4d93 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ tl \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,fsstorage,\ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index dc42bb1a60a3..dfe35c5d8d34 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ comphelper \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 8e7b9a2f1273..292e7f14815d 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,svl,\ tl \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,svl,\ diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk b/svtools/CppunitTest_svtools_dialogs_test.mk index 92c5f1ab03dd..28c4db4742ea 100644 --- a/svtools/CppunitTest_svtools_dialogs_test.mk +++ b/svtools/CppunitTest_svtools_dialogs_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,svtools_dialogs_test,boost_headers)) diff --git a/svtools/CppunitTest_svtools_graphic.mk b/svtools/CppunitTest_svtools_graphic.mk index 17056e51d0da..f38e1168e5c1 100644 --- a/svtools/CppunitTest_svtools_graphic.mk +++ b/svtools/CppunitTest_svtools_graphic.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_graphic, \ test \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,svtools_graphic,\ diff --git a/svtools/CppunitTest_svtools_html.mk b/svtools/CppunitTest_svtools_html.mk index ebc6e3b6d30d..e3e56e4d9949 100644 --- a/svtools/CppunitTest_svtools_html.mk +++ b/svtools/CppunitTest_svtools_html.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_html, \ tl \ sal \ svt \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 94c49fc5e5e3..176a88b15fad 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ tl \ ucbhelper \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,langsupport,\ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 2f3ca6a97a3a..fb1d1cabc87d 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_use_libraries,svt,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,svt,\ diff --git a/svx/CppunitTest_svx_dialogs_test.mk b/svx/CppunitTest_svx_dialogs_test.mk index 020e6ce6116d..efc2903b2201 100644 --- a/svx/CppunitTest_svx_dialogs_test.mk +++ b/svx/CppunitTest_svx_dialogs_test.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svx_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,svx_dialogs_test,boost_headers)) diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 0cecfa02357c..844ab0b45e16 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Executable_use_libraries,gengal,\ utl \ vcl \ svxcore \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,gengal,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 2c91b137305a..d326ad7365eb 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -70,7 +70,6 @@ $(eval $(call gb_Library_use_libraries,svx,\ vcl \ xo \ xmlscript \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 1847921c58c5..18cc965ff8dd 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -77,7 +77,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,svxcore,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index a2071d81bf8b..085b52ec3991 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ diff --git a/sw/CppunitTest_sw_dialogs_test.mk b/sw/CppunitTest_sw_dialogs_test.mk index 8f1efa6343ed..4d513f759753 100644 --- a/sw/CppunitTest_sw_dialogs_test.mk +++ b/sw/CppunitTest_sw_dialogs_test.mk @@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,sw_dialogs_test,boost_headers)) diff --git a/sw/CppunitTest_sw_dialogs_test_2.mk b/sw/CppunitTest_sw_dialogs_test_2.mk index 12d34c4e060f..150f31c88f82 100644 --- a/sw/CppunitTest_sw_dialogs_test_2.mk +++ b/sw/CppunitTest_sw_dialogs_test_2.mk @@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_dialogs_test2, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,sw_dialogs_test2,boost_headers)) diff --git a/sw/CppunitTest_sw_docbookexport.mk b/sw/CppunitTest_sw_docbookexport.mk index 9e5a45c41d1c..bbb3c9e8f8bd 100644 --- a/sw/CppunitTest_sw_docbookexport.mk +++ b/sw/CppunitTest_sw_docbookexport.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_docbookexport, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_docbookexport,\ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 9a81076c8780..b0677f5c3049 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -37,7 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk index 347959f376dc..97ce20201c6d 100644 --- a/sw/CppunitTest_sw_globalfilter.mk +++ b/sw/CppunitTest_sw_globalfilter.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_globalfilter, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_globalfilter,\ diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index bab40cbab110..c9934c5b5bf9 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_htmlexport,\ diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk index 410c6baa9d26..0382c5844021 100644 --- a/sw/CppunitTest_sw_htmlimport.mk +++ b/sw/CppunitTest_sw_htmlimport.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlimport, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_htmlimport,\ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 91327db91e91..ff410443e536 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -46,7 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 9a21bb358d83..3b47059546cf 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ vbahelper \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index 18d06733cbec..e8c43ad931c9 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odfexport, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_odfexport,\ diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index d79de18dd006..302f24a86897 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odfimport, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_odfimport,\ diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk index 7c88db6ed6bc..ad5467db30a3 100644 --- a/sw/CppunitTest_sw_ooxmlexport8.mk +++ b/sw/CppunitTest_sw_ooxmlexport8.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlexport8, \ tl \ vcl \ svxcore \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport8,\ diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 76f78f21b8ae..38fb79414a87 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport, \ tl \ vcl \ svxcore \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlimport,\ diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index b2151cef1fcc..a09d3b4a5985 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport, \ unotest \ utl \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport,\ diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index 5cfa97836398..15527f1c029d 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfimport, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_rtfimport,\ diff --git a/sw/CppunitTest_sw_tiledrendering.mk b/sw/CppunitTest_sw_tiledrendering.mk index 250609721e5c..3ba3d3eb4e53 100644 --- a/sw/CppunitTest_sw_tiledrendering.mk +++ b/sw/CppunitTest_sw_tiledrendering.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_tiledrendering, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_tiledrendering,\ diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index e048fae7e2c9..372909b9cfd3 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \ vcl \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_uiwriter,\ diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index c23ae7f8e886..ba31ae9d9a5a 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -57,7 +57,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \ vcl \ xmlreader \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_uwriter,\ diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index a92d22bae6c7..c6429f5419f5 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \ svl \ sw \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_ww8export,\ diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk index c09e528b0aa9..f5e37733c3ed 100644 --- a/sw/CppunitTest_sw_ww8export2.mk +++ b/sw/CppunitTest_sw_ww8export2.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export2, \ utl \ sw \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_ww8export2,\ diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index 4b38dfd85a2f..7881d6ea656c 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \ sfx \ sw \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,sw_ww8import,\ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ca4975049857..3f14c215f62f 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,msword,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,msword,\ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 3f24c6d0bff1..6b99a22983cb 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -78,7 +78,6 @@ $(eval $(call gb_Library_use_libraries,sw,\ vcl \ xmlreader \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,sw,\ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 6396a286c509..11a2f0f326e1 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,swd,\ sot \ tl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,swd,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 51265984afe8..f40d1a7712e9 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_use_libraries,swui,\ ucbhelper \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,swui,\ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index fa8e8b2cb4ea..ac06758fa9fa 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ utl \ vbahelper \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,vbaswobj,\ diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index d9f981897c3a..3e0c03ae7963 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -21,8 +21,7 @@ define sw_ooxmlexport_libraries unotest \ utl \ vcl \ - svxcore \ - $(gb_UWINAPI) + svxcore endef define sw_ooxmlexport_components diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 5bfe52712b3a..7ef8ca836e87 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ utl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,subsequenttest,\ diff --git a/test/Library_test.mk b/test/Library_test.mk index c2fb00be1d98..957ffc0d97e0 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,test,\ unotest \ vcl \ drawinglayer \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,test,\ diff --git a/test/Library_test_setupvcl.mk b/test/Library_test_setupvcl.mk index dd48ad813758..16f79ddf3a41 100644 --- a/test/Library_test_setupvcl.mk +++ b/test/Library_test_setupvcl.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,test-setupvcl, \ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_sdk_api,test-setupvcl)) diff --git a/test/Library_vclbootstrapprotector.mk b/test/Library_vclbootstrapprotector.mk index eb19f860c0bd..d01bc66795c0 100644 --- a/test/Library_vclbootstrapprotector.mk +++ b/test/Library_vclbootstrapprotector.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,vclbootstrapprotector, \ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_sdk_api,vclbootstrapprotector)) diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index b9a42d3c97ae..3aea70643362 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,tk,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,tk,\ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index aced4bf6698a..8cd8e7c3e9b3 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_sdk_api,tools_test)) $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index ad9adfbe376b..6e06a51ef406 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,bestreversemap)) $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b50537c7a431..e774ffc18f0a 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,tl,\ cppu \ sal \ sax \ - $(gb_UWINAPI) \ )) diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 51f2395990d1..4708f9fedf1f 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppuhelper \ sal \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,cached1,\ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index d8acf21a48e7..9aefed2c8aa4 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppuhelper \ sal \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,srtrs1,\ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 4b1f1d96aff4..ce7144f8fe13 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ tl \ ucbhelper \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucb1,\ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 0b468154400f..0d0b83b573c1 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ sax \ ucbhelper \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,ucpcmis1,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 4e7b76ac5c04..f4afd730c74c 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ sal \ salhelper \ ucbhelper \ - $(gb_UWINAPI) \ )) ifeq ($(WITH_WEBDAV),neon) diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index fc2853deefa2..a3f5fe1b3f2c 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ cppuhelper \ sal \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index e492579ac05b..baa87714b6e0 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ salhelper \ tl \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucpext,\ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index a85c6c494b86..4505708cbac8 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ cppuhelper \ sal \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index 9c0549076b0c..1eb8619783d7 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ cppuhelper \ sal \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,ucpftp1,\ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 16501dbbcdcb..5e4c6d68c52b 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ sal \ salhelper \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucphier1,\ diff --git a/ucb/Library_ucpimage.mk b/ucb/Library_ucpimage.mk index 9c683f748f75..13e64c7f8e3c 100644 --- a/ucb/Library_ucpimage.mk +++ b/ucb/Library_ucpimage.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,ucpimage, \ sal \ ucbhelper \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_sdk_api,ucpimage)) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index 355ab7356a57..e61ec545e0e0 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ sal \ salhelper \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index fb96f8022ff6..54ff1fee2fcb 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ sal \ salhelper \ ucbhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 5226d9e76528..85c8e16f1573 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_defs,ucbhelper,\ diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 3ec8b1689b04..f5f8aecaddef 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index 65366171848b..52417c9883a9 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 558b8a745361..ea697699ee82 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,unotest,\ cppuhelper \ sal \ sb \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,unotest,\ diff --git a/unotools/CppunitTest_unotools_fontdefs.mk b/unotools/CppunitTest_unotools_fontdefs.mk index 38e51b03bed4..5eada2084a65 100644 --- a/unotools/CppunitTest_unotools_fontdefs.mk +++ b/unotools/CppunitTest_unotools_fontdefs.mk @@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,unotools_fontdefs, \ sal \ svt \ utl \ - $(gb_UWINAPI) \ )) # vim: set noet sw=4 ts=4: diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 0270b4f84b92..8656ebbe594c 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,utl,\ salhelper \ tl \ ucbhelper \ - $(gb_UWINAPI) \ )) # add all source files that shall be compiled with exceptions enabled diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index ccbd29287b6a..27640e70f0e4 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,unordf,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,unordf,\ diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 5fcd48d5e299..c55e4d6cf725 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ cppuhelper \ cppu \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,unoxml,\ diff --git a/uui/CppunitTest_uui_dialogs_test.mk b/uui/CppunitTest_uui_dialogs_test.mk index 85ea191ce923..ed652c7770b0 100644 --- a/uui/CppunitTest_uui_dialogs_test.mk +++ b/uui/CppunitTest_uui_dialogs_test.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,uui_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,uui_dialogs_test,boost_headers)) diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index c1054aa47a81..6f3a8417ea78 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,uui,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,uui,\ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 341453aa8e97..0c66fa19aa04 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,msforms,\ tl \ vbahelper \ vcl \ - $(gb_UWINAPI) \ )) # add all source files that shall be compiled with exceptions enabled diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index a96eee5c2ff4..7f1c7983707c 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) # add all source files that shall be compiled with exceptions enabled diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk index 70ce156889dc..d01684480b03 100644 --- a/vcl/CppunitTest_vcl_bitmap_test.mk +++ b/vcl/CppunitTest_vcl_bitmap_test.mk @@ -39,7 +39,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_bitmap_test, \ unotest \ vcl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_bitmap_test)) diff --git a/vcl/CppunitTest_vcl_bitmapprocessor_test.mk b/vcl/CppunitTest_vcl_bitmapprocessor_test.mk index 76dc666465e7..6bdffa9d417b 100644 --- a/vcl/CppunitTest_vcl_bitmapprocessor_test.mk +++ b/vcl/CppunitTest_vcl_bitmapprocessor_test.mk @@ -33,7 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_bitmapprocessor_test, \ unotest \ vcl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_api,vcl_bitmapprocessor_test,\ diff --git a/vcl/CppunitTest_vcl_blocklistparser_test.mk b/vcl/CppunitTest_vcl_blocklistparser_test.mk index 8cc3adde8c9d..b585382b44bb 100644 --- a/vcl/CppunitTest_vcl_blocklistparser_test.mk +++ b/vcl/CppunitTest_vcl_blocklistparser_test.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_blocklistparser_test, \ test \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_blocklistparser_test)) diff --git a/vcl/CppunitTest_vcl_complextext.mk b/vcl/CppunitTest_vcl_complextext.mk index 0e5b5093a899..62a0f5b7fc9b 100644 --- a/vcl/CppunitTest_vcl_complextext.mk +++ b/vcl/CppunitTest_vcl_complextext.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_complextext, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_complextext)) diff --git a/vcl/CppunitTest_vcl_dialogs_test.mk b/vcl/CppunitTest_vcl_dialogs_test.mk index ce28195d9de7..a602b42707d0 100644 --- a/vcl/CppunitTest_vcl_dialogs_test.mk +++ b/vcl/CppunitTest_vcl_dialogs_test.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,vcl_dialogs_test,boost_headers)) diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk index 15efa5e1cfab..7137ee13b96f 100644 --- a/vcl/CppunitTest_vcl_filters_test.mk +++ b/vcl/CppunitTest_vcl_filters_test.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_filters_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_filters_test)) diff --git a/vcl/CppunitTest_vcl_font.mk b/vcl/CppunitTest_vcl_font.mk index 55560bd7c85d..8b66a989fa50 100644 --- a/vcl/CppunitTest_vcl_font.mk +++ b/vcl/CppunitTest_vcl_font.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_font, \ tk \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_font)) diff --git a/vcl/CppunitTest_vcl_fontcharmap.mk b/vcl/CppunitTest_vcl_fontcharmap.mk index 46cb1175bbfe..0c596bf8d2c8 100644 --- a/vcl/CppunitTest_vcl_fontcharmap.mk +++ b/vcl/CppunitTest_vcl_fontcharmap.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_fontcharmap, \ tk \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_fontcharmap)) diff --git a/vcl/CppunitTest_vcl_fontmetric.mk b/vcl/CppunitTest_vcl_fontmetric.mk index 138c9df10289..776064817ea1 100644 --- a/vcl/CppunitTest_vcl_fontmetric.mk +++ b/vcl/CppunitTest_vcl_fontmetric.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_fontmetric, \ tk \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_fontmetric)) diff --git a/vcl/CppunitTest_vcl_jpeg_read_write_test.mk b/vcl/CppunitTest_vcl_jpeg_read_write_test.mk index 02958d32dcc8..60b2a11666b4 100644 --- a/vcl/CppunitTest_vcl_jpeg_read_write_test.mk +++ b/vcl/CppunitTest_vcl_jpeg_read_write_test.mk @@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_jpeg_read_write_test, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_jpeg_read_write_test)) diff --git a/vcl/CppunitTest_vcl_lifecycle.mk b/vcl/CppunitTest_vcl_lifecycle.mk index 8b500eb3ab55..44914e8e0294 100644 --- a/vcl/CppunitTest_vcl_lifecycle.mk +++ b/vcl/CppunitTest_vcl_lifecycle.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_lifecycle, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_lifecycle)) diff --git a/vcl/CppunitTest_vcl_mapmode.mk b/vcl/CppunitTest_vcl_mapmode.mk index a11e0153a2a1..e29a16af4e0f 100644 --- a/vcl/CppunitTest_vcl_mapmode.mk +++ b/vcl/CppunitTest_vcl_mapmode.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_mapmode, \ tk \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_mapmode)) diff --git a/vcl/CppunitTest_vcl_outdev.mk b/vcl/CppunitTest_vcl_outdev.mk index b77c4dcbe671..183432fccfe6 100644 --- a/vcl/CppunitTest_vcl_outdev.mk +++ b/vcl/CppunitTest_vcl_outdev.mk @@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_outdev, \ tl \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_outdev)) diff --git a/vcl/CppunitTest_vcl_pdfexport.mk b/vcl/CppunitTest_vcl_pdfexport.mk index 1e56d24f3c84..fbc95d868d57 100644 --- a/vcl/CppunitTest_vcl_pdfexport.mk +++ b/vcl/CppunitTest_vcl_pdfexport.mk @@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_pdfexport, \ utl \ tl \ vcl \ - $(gb_UWINAPI) \ + xmlsecurity \ )) $(eval $(call gb_CppunitTest_use_external,vcl_pdfexport,boost_headers)) diff --git a/vcl/CppunitTest_vcl_svm_test.mk b/vcl/CppunitTest_vcl_svm_test.mk index 499ae5b0c85f..8d93f27a0b1b 100644 --- a/vcl/CppunitTest_vcl_svm_test.mk +++ b/vcl/CppunitTest_vcl_svm_test.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_svm_test, \ unotest \ vcl \ utl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_svm_test)) diff --git a/vcl/CppunitTest_vcl_timer.mk b/vcl/CppunitTest_vcl_timer.mk index eef6eb90b17b..b17bfc3a27f6 100644 --- a/vcl/CppunitTest_vcl_timer.mk +++ b/vcl/CppunitTest_vcl_timer.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_timer, \ test \ unotest \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_timer)) diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk index f7858f9ddf19..9e057d9c7581 100644 --- a/vcl/CppunitTest_vcl_wmf_test.mk +++ b/vcl/CppunitTest_vcl_wmf_test.mk @@ -61,7 +61,6 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_wmf_test,\ unotest \ utl \ xmlreader \ - $(gb_UWINAPI) \ )) ifeq ($(OS),MACOSX) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 246163c872bc..9fefd4e25de5 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -89,7 +89,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\ sal \ salhelper \ xmlreader \ - $(gb_UWINAPI) \ )) ifeq ($(OS),MACOSX) diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk index ed40e65e3791..8ee963919832 100644 --- a/winaccessibility/Library_winaccessibility.mk +++ b/winaccessibility/Library_winaccessibility.mk @@ -59,7 +59,6 @@ $(eval $(call gb_Library_use_libraries,winaccessibility,\ sal \ tk \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_system_win32_libs,winaccessibility,\ diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk b/writerfilter/CppunitTest_writerfilter_misc.mk index 741a48e1d9a2..1b45ec716cda 100644 --- a/writerfilter/CppunitTest_writerfilter_misc.mk +++ b/writerfilter/CppunitTest_writerfilter_misc.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_misc, \ cppu \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,writerfilter_misc,\ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 1fa6afcb82d1..e8c58771e223 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ unotest \ vcl \ writerfilter \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok)) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index b23256efff74..cd8ea4c06cdd 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,writerfilter,\ diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk b/writerperfect/CppunitTest_writerperfect_calc.mk index 93ae3f3624b5..317c43ff8296 100644 --- a/writerperfect/CppunitTest_writerperfect_calc.mk +++ b/writerperfect/CppunitTest_writerperfect_calc.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_calc,\ ucbhelper \ unotest \ wpftqahelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_calc)) diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk index c7b511376139..7f95b28ffdb7 100644 --- a/writerperfect/CppunitTest_writerperfect_draw.mk +++ b/writerperfect/CppunitTest_writerperfect_draw.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_draw,\ ucbhelper \ unotest \ wpftqahelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_draw)) diff --git a/writerperfect/CppunitTest_writerperfect_import.mk b/writerperfect/CppunitTest_writerperfect_import.mk index 152d26fdb9e4..79e38faeeb66 100644 --- a/writerperfect/CppunitTest_writerperfect_import.mk +++ b/writerperfect/CppunitTest_writerperfect_import.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_import,\ unotest \ utl \ wpftqahelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_import)) diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk index 52e4b6b7ffe0..e257fb4f4f09 100644 --- a/writerperfect/CppunitTest_writerperfect_impress.mk +++ b/writerperfect/CppunitTest_writerperfect_impress.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_impress,\ ucbhelper \ unotest \ wpftqahelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_impress)) diff --git a/writerperfect/CppunitTest_writerperfect_wpftimport.mk b/writerperfect/CppunitTest_writerperfect_wpftimport.mk index ed5187b4b4c9..02247f46a1d3 100644 --- a/writerperfect/CppunitTest_writerperfect_wpftimport.mk +++ b/writerperfect/CppunitTest_writerperfect_wpftimport.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_wpftimport,\ utl \ wpftqahelper \ writerperfect \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_wpftimport)) diff --git a/writerperfect/CppunitTest_writerperfect_writer.mk b/writerperfect/CppunitTest_writerperfect_writer.mk index fc038a9fcddc..6cc572754255 100644 --- a/writerperfect/CppunitTest_writerperfect_writer.mk +++ b/writerperfect/CppunitTest_writerperfect_writer.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_writer,\ ucbhelper \ unotest \ wpftqahelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_writer)) diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk index c4aecf391d44..d5935efb26d2 100644 --- a/writerperfect/Library_wpftcalc.mk +++ b/writerperfect/Library_wpftcalc.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,wpftcalc,\ vcl \ writerperfect \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,wpftcalc,\ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index be7300d1c7f9..18425b4f22ea 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ vcl \ writerperfect \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,wpftdraw,\ diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index 18c8afa110bc..62b5482b6acf 100644 --- a/writerperfect/Library_wpftimpress.mk +++ b/writerperfect/Library_wpftimpress.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\ vcl \ writerperfect \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,wpftimpress,\ diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index a7ab45207f34..cc59480eae11 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ vcl \ writerperfect \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_externals,wpftwriter,\ diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk index 88b842189e40..430503ff81b5 100644 --- a/writerperfect/Library_writerperfect.mk +++ b/writerperfect/Library_writerperfect.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,writerperfect,\ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,writerperfect,\ diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk index 45eb4178f311..eaa83d554a92 100644 --- a/xmloff/CppunitTest_xmloff_uxmloff.mk +++ b/xmloff/CppunitTest_xmloff_uxmloff.mk @@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_uxmloff, \ unotest \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_components,xmloff_uxmloff,\ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index d8cf94879670..1978f396c8a6 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,xo,\ tl \ utl \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xo,\ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 202a9c2de351..be4766b6737b 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,xof,\ salhelper \ sax \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xof,\ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index ed6d06ca60bb..fa4a6711c9b4 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_external,xmlreader,boost_headers)) $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ - $(gb_UWINAPI) \ )) # cppu is only needed due to the cppumaker -C hack diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index f4f9d29d7cdf..daa9ae4ba2ca 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ sal \ tl \ i18nlangtag \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_set_include,xmlscript,\ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 855f9807e614..faa5459d3e88 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ svl \ test \ tl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ diff --git a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk index 875ffbcae731..945c33af7bd0 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk @@ -48,7 +48,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_dialogs_test, \ utl \ vcl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_external,xmlsecurity_dialogs_test,boost_headers)) diff --git a/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk b/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk index a21a1e37a7d4..021ab8dbe99f 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk @@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_pdfsigning, \ utl \ xmlsecurity \ vcl \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_pdfsigning,\ diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index f7bbb0e83753..e39e5c085bac 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_signing, \ unotest \ utl \ xmlsecurity \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\ diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index c3e42e0f001d..a0fe40a5a033 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ i18nlangtag \ xsec_fw \ xsec_xmlsec \ - $(gb_UWINAPI) \ )) ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),) diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index b6fa2dcf935a..c205a3f2d684 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppu \ cppuhelper \ sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ diff --git a/xmlsecurity/Library_xsec_gpg.mk b/xmlsecurity/Library_xsec_gpg.mk index 21d77f50669b..95bd533531de 100644 --- a/xmlsecurity/Library_xsec_gpg.mk +++ b/xmlsecurity/Library_xsec_gpg.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,xsec_gpg,\ svl \ tl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_exception_objects,xsec_gpg,\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 86411941763d..db161c13995f 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ svl \ tl \ xo \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_use_packages,xsec_xmlsec,\ |