Skip to content

Commit de030cd

Browse files
davidodavido
committed
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <[email protected]> Tested-by: David Ostrovsky <[email protected]>
1 parent 489414f commit de030cd

File tree

559 files changed

+38
-1472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

559 files changed

+38
-1472
lines changed

‎Library_merged.mk

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
2525
sal \
2626
salhelper \
2727
xmlreader \
28-
$(gb_UWINAPI) \
2928
))
3029

3130
ifeq ($(OS),WNT)

‎Repository.mk

-3
Original file line numberDiff line numberDiff line change
@@ -550,9 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
550550
log_uno_uno \
551551
unsafe_uno_uno \
552552
$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
553-
$(if $(filter $(OS),WNT), \
554-
uwinapi \
555-
) \
556553
))
557554

558555
$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \

‎RepositoryExternal.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3036,7 +3036,7 @@ endif
30363036

30373037
ifeq ($(OS),WNT)
30383038
$(call gb_LinkTarget_add_libs,$(1),\
3039-
$(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 \
3039+
$(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 \
30403040
)
30413041
else ifeq ($(OS),MACOSX)
30423042
$(call gb_LinkTarget_add_libs,$(1),\

‎UnoControls/Library_ctl.mk

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\
2323
cppuhelper \
2424
sal \
2525
tl \
26-
$(gb_UWINAPI) \
2726
))
2827

2928
$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))

‎accessibility/Library_acc.mk

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,acc,\
3535
tl \
3636
utl \
3737
vcl \
38-
$(gb_UWINAPI) \
3938
))
4039

4140
$(eval $(call gb_Library_add_exception_objects,acc,\

‎animations/Library_animcore.mk

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\
3030
cppu \
3131
cppuhelper \
3232
sal \
33-
$(gb_UWINAPI) \
3433
))
3534

3635
$(eval $(call gb_Library_add_exception_objects,animcore,\

‎avmedia/Library_avmedia.mk

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
4747
tl \
4848
utl \
4949
vcl \
50-
$(gb_UWINAPI) \
5150
))
5251

5352
ifeq ($(ENABLE_GLTF),TRUE)

‎avmedia/Library_avmediaMacAVF.mk

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaMacAVF,\
2727
sal \
2828
tl \
2929
vcl \
30-
$(gb_UWINAPI) \
3130
))
3231

3332
$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaMacAVF,\

‎avmedia/Library_avmediaQuickTime.mk

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
2727
sal \
2828
tl \
2929
vcl \
30-
$(gb_UWINAPI) \
3130
))
3231

3332
$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\

‎avmedia/Library_avmediagst.mk

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
4444
salhelper \
4545
tl \
4646
vcl \
47-
$(gb_UWINAPI) \
4847
))
4948

5049
$(eval $(call gb_Library_add_exception_objects,avmediagst,\

‎avmedia/Library_avmediagst_0_10.mk

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
3232
salhelper \
3333
tl \
3434
vcl \
35-
$(gb_UWINAPI) \
3635
))
3736

3837
$(eval $(call gb_Library_add_libs,avmediagst_0_10,\

‎avmedia/Library_avmediaogl.mk

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediaogl,\
2828
salhelper \
2929
tl \
3030
vcl \
31-
$(gb_UWINAPI) \
3231
))
3332

3433
$(eval $(call gb_Library_set_include,avmediaogl,\

‎avmedia/Library_avmediavlc.mk

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,avmediavlc,\
3636
vcl \
3737
utl \
3838
salhelper \
39-
$(gb_UWINAPI) \
4039
))
4140

4241
$(eval $(call gb_Library_add_exception_objects,avmediavlc,\

‎avmedia/Library_avmediawin.mk

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
2828
tl \
2929
utl \
3030
vcl \
31-
$(gb_UWINAPI) \
3231
))
3332

3433
$(eval $(call gb_Library_use_system_win32_libs,avmediawin,\

‎basctl/CppunitTest_basctl_dialogs_test.mk

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basctl_dialogs_test, \
4949
utl \
5050
vcl \
5151
xo \
52-
$(gb_UWINAPI) \
5352
))
5453

5554
$(eval $(call gb_CppunitTest_use_external,basctl_dialogs_test,boost_headers))

‎basctl/Library_basctl.mk

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\
6060
ucbhelper \
6161
vcl \
6262
xmlscript \
63-
$(gb_UWINAPI) \
6463
))
6564

6665
$(eval $(call gb_Library_add_exception_objects,basctl,\

‎basegfx/CppunitTest_basegfx.mk

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx,\
1919
cppu \
2020
cppuhelper \
2121
sal \
22-
$(gb_UWINAPI) \
2322
))
2423

2524
$(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\

‎basegfx/Library_basegfx.mk

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
1919
cppu \
2020
cppuhelper \
2121
sal \
22-
$(gb_UWINAPI) \
2322
))
2423

2524
$(eval $(call gb_Library_set_include,basegfx,\

‎basic/CppunitTest_basic_macros.mk

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
3636
utl \
3737
vcl \
3838
xmlscript \
39-
$(gb_UWINAPI) \
4039
))
4140

4241
ifeq ($(OS),WNT)

‎basic/CppunitTest_basic_scanner.mk

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
3131
utl \
3232
vcl \
3333
xmlscript \
34-
$(gb_UWINAPI) \
3534
))
3635

3736
ifeq ($(OS),WNT)

‎basic/Library_sb.mk

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,sb,\
5656
utl \
5757
vcl \
5858
xmlscript \
59-
$(gb_UWINAPI) \
6059
))
6160

6261
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)

‎bean/Library_officebean.mk

-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,4 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
2727
))
2828
endif
2929

30-
$(eval $(call gb_Library_use_libraries,officebean,\
31-
$(gb_UWINAPI) \
32-
))
33-
3430
# vim: set noet sw=4 ts=4:

‎bean/com/sun/star/comp/beans/LocalOfficeConnection.java

-11
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,6 @@ public class LocalOfficeConnection
9292
System.err.println( "cannot find msvcr71" );
9393
}
9494

95-
try
96-
{
97-
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "uwinapi");
98-
}
99-
catch (Throwable e)
100-
{
101-
// loading twice would fail
102-
System.err.println("cannot find uwinapi:");
103-
e.printStackTrace();
104-
}
105-
10695
try
10796
{
10897
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "jawt");

‎binaryurp/CppunitTest_binaryurp_test-cache.mk

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ $(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers))
1313

1414
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
1515
sal \
16-
$(gb_UWINAPI) \
1716
))
1817

1918
$(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\

‎binaryurp/CppunitTest_binaryurp_test-unmarshal.mk

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
1616
cppuhelper \
1717
sal \
1818
salhelper \
19-
$(gb_UWINAPI) \
2019
))
2120

2221
$(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\

‎binaryurp/Library_binaryurp.mk

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\
2020
cppuhelper \
2121
sal \
2222
salhelper \
23-
$(gb_UWINAPI) \
2423
))
2524

2625
$(eval $(call gb_Library_add_exception_objects,binaryurp,\

‎bridges/Library_java_uno.mk

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\
2323
jvmaccess \
2424
sal \
2525
salhelper \
26-
$(gb_UWINAPI) \
2726
))
2827

2928
$(eval $(call gb_Library_add_exception_objects,java_uno,\

‎canvas/Library_cairocanvas.mk

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
4242
tl \
4343
i18nlangtag \
4444
canvastools \
45-
$(gb_UWINAPI) \
4645
))
4746

4847
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\

‎canvas/Library_canvasfactory.mk

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\
3131
sal \
3232
utl \
3333
vcl \
34-
$(gb_UWINAPI) \
3534
))
3635

3736
$(eval $(call gb_Library_add_exception_objects,canvasfactory,\

‎canvas/Library_canvastools.mk

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\
3636
tk \
3737
tl \
3838
vcl \
39-
$(gb_UWINAPI) \
4039
))
4140

4241
$(eval $(call gb_Library_add_exception_objects,canvastools,\

‎canvas/Library_directx9canvas.mk

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
4242
tl \
4343
utl \
4444
i18nlangtag \
45-
$(gb_UWINAPI) \
4645
))
4746

4847
$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\

‎canvas/Library_gdipluscanvas.mk

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
4242
tl \
4343
utl \
4444
i18nlangtag \
45-
$(gb_UWINAPI) \
4645
))
4746

4847
$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\

‎canvas/Library_oglcanvas.mk

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,oglcanvas,\
2424
tl \
2525
i18nlangtag \
2626
canvastools \
27-
$(gb_UWINAPI) \
2827
))
2928

3029
$(eval $(call gb_Library_add_exception_objects,oglcanvas,\

‎canvas/Library_simplecanvas.mk

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\
3232
cppu \
3333
cppuhelper \
3434
sal \
35-
$(gb_UWINAPI) \
3635
))
3736

3837
$(eval $(call gb_Library_add_exception_objects,simplecanvas,\

‎canvas/Library_vclcanvas.mk

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
3737
tk \
3838
tl \
3939
vcl \
40-
$(gb_UWINAPI) \
4140
))
4241

4342
$(eval $(call gb_Library_add_exception_objects,vclcanvas,\

‎chart2/CppunitTest_chart2_common_functors.mk

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_common_functors, \
2828
cppuhelper \
2929
sal \
3030
salhelper \
31-
$(gb_UWINAPI) \
3231
))
3332

3433
$(eval $(call gb_CppunitTest_set_include,chart2_common_functors,\

‎chart2/CppunitTest_chart2_dialogs_test.mk

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dialogs_test, \
5151
utl \
5252
vcl \
5353
xo \
54-
$(gb_UWINAPI) \
5554
))
5655

5756
$(eval $(call gb_CppunitTest_use_external,chart2_dialogs_test,boost_headers))

‎chart2/CppunitTest_chart2_dump.mk

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \
5555
vbahelper \
5656
xo \
5757
sw \
58-
$(gb_UWINAPI) \
5958
))
6059

6160
$(eval $(call gb_CppunitTest_set_include,chart2_dump,\

‎chart2/CppunitTest_chart2_export.mk

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
5656
vbahelper \
5757
xo \
5858
sw \
59-
$(gb_UWINAPI) \
6059
))
6160

6261
$(eval $(call gb_CppunitTest_set_include,chart2_export,\

‎chart2/CppunitTest_chart2_import.mk

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
5555
vbahelper \
5656
xo \
5757
sw \
58-
$(gb_UWINAPI) \
5958
))
6059

6160
$(eval $(call gb_CppunitTest_set_include,chart2_import,\

‎chart2/CppunitTest_chart2_pivot_chart_test.mk

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \
5555
vbahelper \
5656
xo \
5757
sw \
58-
$(gb_UWINAPI) \
5958
))
6059

6160
$(eval $(call gb_CppunitTest_set_include,chart2_pivot_chart_test,\

‎chart2/CppunitTest_chart2_trendcalculators.mk

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \
5555
vbahelper \
5656
xo \
5757
sw \
58-
$(gb_UWINAPI) \
5958
))
6059

6160
$(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\

‎chart2/CppunitTest_chart2_xshape.mk

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
5555
vbahelper \
5656
xo \
5757
sw \
58-
$(gb_UWINAPI) \
5958
))
6059

6160
$(eval $(call gb_CppunitTest_set_include,chart2_xshape,\

‎chart2/Library_chartcontroller.mk

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
4444
ucbhelper \
4545
utl \
4646
vcl \
47-
$(gb_UWINAPI) \
4847
))
4948

5049
$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))

‎chart2/Library_chartcore.mk

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
6161
ucbhelper \
6262
utl \
6363
vcl \
64-
$(gb_UWINAPI) \
6564
))
6665

6766
$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))

‎chart2/Library_chartopengl.mk

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
4747
ucbhelper \
4848
utl \
4949
vcl \
50-
$(gb_UWINAPI) \
5150
))
5251

5352
$(eval $(call gb_Library_add_exception_objects,chartopengl,\

‎cli_ure/Executable_climaker.mk

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_use_libraries,climaker,\
3232
sal \
3333
salhelper \
3434
unoidl \
35-
$(gb_UWINAPI) \
3635
))
3736

3837
$(eval $(call gb_Executable_use_system_win32_libs,climaker,\

‎comphelper/CppunitTest_comphelper_ifcontainer.mk

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_ifcontainer,\
2323
cppu \
2424
cppuhelper \
2525
sal \
26-
$(gb_UWINAPI) \
2726
))
2827

2928
# vim: set noet sw=4 ts=4:

0 commit comments

Comments
 (0)