summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2017-03-04 14:36:08 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2017-04-21 18:18:44 +0200
commitde030cd7a234fd9191364647deb1a4836ca992cb (patch)
tree8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /sw
parent489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (diff)
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/CppunitTest_sw_dialogs_test.mk1
-rw-r--r--sw/CppunitTest_sw_dialogs_test_2.mk1
-rw-r--r--sw/CppunitTest_sw_docbookexport.mk1
-rw-r--r--sw/CppunitTest_sw_filters_test.mk1
-rw-r--r--sw/CppunitTest_sw_globalfilter.mk1
-rw-r--r--sw/CppunitTest_sw_htmlexport.mk1
-rw-r--r--sw/CppunitTest_sw_htmlimport.mk1
-rw-r--r--sw/CppunitTest_sw_layout_test.mk1
-rw-r--r--sw/CppunitTest_sw_macros_test.mk1
-rw-r--r--sw/CppunitTest_sw_odfexport.mk1
-rw-r--r--sw/CppunitTest_sw_odfimport.mk1
-rw-r--r--sw/CppunitTest_sw_ooxmlexport8.mk1
-rw-r--r--sw/CppunitTest_sw_ooxmlimport.mk1
-rw-r--r--sw/CppunitTest_sw_rtfexport.mk1
-rw-r--r--sw/CppunitTest_sw_rtfimport.mk1
-rw-r--r--sw/CppunitTest_sw_tiledrendering.mk1
-rw-r--r--sw/CppunitTest_sw_uiwriter.mk1
-rw-r--r--sw/CppunitTest_sw_uwriter.mk1
-rw-r--r--sw/CppunitTest_sw_ww8export.mk1
-rw-r--r--sw/CppunitTest_sw_ww8export2.mk1
-rw-r--r--sw/CppunitTest_sw_ww8import.mk1
-rw-r--r--sw/Library_msword.mk1
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/Library_swd.mk1
-rw-r--r--sw/Library_swui.mk1
-rw-r--r--sw/Library_vbaswobj.mk1
-rw-r--r--sw/ooxmlexport_setup.mk3
27 files changed, 1 insertions, 28 deletions
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