summaryrefslogtreecommitdiff
path: root/bean
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 /bean
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 'bean')
-rw-r--r--bean/Library_officebean.mk4
-rw-r--r--bean/com/sun/star/comp/beans/LocalOfficeConnection.java11
2 files changed, 0 insertions, 15 deletions
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)