[Libreoffice-commits] core.git: bean/native embeddedobj/test odk/examples svl/unx tools/source

2021-01-04 Thread umutbayramoglu (via logerrit) 
 bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c   
  |2 +-
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c  
  |2 +-
 embeddedobj/test/Container1/nativelib/nativeview.c 
  |2 +-
 
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
|4 ++--
 
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
 |4 ++--
 svl/unx/source/svdde/ddedummy.cxx  
  |4 ++--
 tools/source/stream/strmunx.cxx
  |4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 9feea2ecc59c6daa42dece6c30cf33f5e7df7561
Author: umutbayramoglu 
AuthorDate: Mon Dec 7 20:37:42 2020 +
Commit: Stephan Bergmann 
CommitDate: Tue Jan 5 08:36:28 2021 +0100

tdf#96505 : Get rid of cargo cult long integer literals

Change-Id: I7b269fb5bafceba071ebe649a696ef61301c4018
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107366
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-by: Tor Lillqvist 

diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index f908d8f63c90..9e534e2262d9 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -103,7 +103,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL 
Java_com_sun_star_comp_beans_LocalOfficeWindo
 /* Get the drawing surface */
 ds = awt.GetDrawingSurface(env, obj_this);
 if (ds == NULL)
-return 0L;
+return 0;
 
 /* Lock the drawing surface */
 lock = ds->Lock(ds);
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 5d1bdb0f5cc8..7f29160250e6 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -97,7 +97,7 @@ JNIEXPORT jlong JNICALL 
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
 
 /* Get the drawing surface */
 if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
-return 0L;
+return 0;
 
 /* Lock the drawing surface */
 lock = ds->Lock(ds);
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c 
b/embeddedobj/test/Container1/nativelib/nativeview.c
index 9d0f478bd410..a58ce54ef587 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -87,7 +87,7 @@ JNIEXPORT jlong JNICALL 
Java_embeddedobj_test_NativeView_getNativeWindow
 
 /* Get the drawing surface */
 if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
-return 0L;
+return 0;
 
 /* Lock the drawing surface */
 lock = ds->Lock(ds);
diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
index 7f4bc1472d58..5343f85e9674 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
@@ -41,7 +41,7 @@
 #include "jawt_md.h"
 #include "nativeview.h"
 
-#define MY_ASSERT(X,S) if (!X) { fprintf(stderr,S); return 0L;}
+#define MY_ASSERT(X,S) if (!X) { fprintf(stderr,S); return 0;}
 
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
@@ -86,7 +86,7 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow
 
 /* Get the drawing surface */
 if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
-return 0L;
+return 0;
 
 /* Lock the drawing surface */
 lock = ds->Lock(ds);
diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
index b7b13d6c640d..f7bef492022c 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
@@ -39,7 +39,7 @@
 #include "jawt_md.h"
 #include "NativeView.h"
 
-#define MY_ASSERT(X,S) if (!X) { fprintf(stderr,"%s\n",S); return 0L;}
+#define MY_ASSERT(X,S) if (!X) { fprintf(stderr,"%s\n",S); return 0;}
 
 #define SYSTEM_WIN32   1
 #define SYSTEM_WIN16   2
@@ -93,7 +93,7 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow
 
 /* Get the drawing surface */
 if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
-return 0L;
+return 0;
 
 /* Lock the drawing surface */
 lock = ds->Lock(ds);
diff

[Libreoffice-commits] core.git: bean/native bridges/source include/jvmaccess include/jvmfwk javaunohelper/source jurt/source jvmfwk/plugins

2021-01-02 Thread Julien Nabet (via logerrit) 
 bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c|   10 ++
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx   |2 
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx   |   40 
+-
 include/jvmaccess/classpath.hxx |7 +
 include/jvmaccess/virtualmachine.hxx|7 +
 include/jvmfwk/framework.hxx|7 +
 javaunohelper/source/preload.cxx|7 +
 jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c |8 ++
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |8 ++
 9 files changed, 78 insertions(+), 18 deletions(-)

New commits:
commit 6e3424ca1131fe371f63e456267de476b5eb0eae
Author: Julien Nabet 
AuthorDate: Sat Jan 2 11:03:12 2021 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 2 11:40:47 2021 +0100

Fix some warnings for Raspberry pi 4 (part2)

Fix these kinds:

/home/pi/lo/libreoffice/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:103:10:
 error:
externally available entity 'is_complex_struct' is not previously declared 
in an included file
(if it is only used in this translation unit, make it static; otherwise, 
provide a declaration of it in an included file) [loplugin:external]
bool is_complex_struct(const typelib_TypeDescription * type)
~^~~

/home/pi/lo/libreoffice/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:129:10:
 error:
externally available entity 'is_float_only_struct' is not previously 
declared in an included file
(if it is only used in this translation unit, make it static; otherwise, 
provide a declaration of it in an included file) [loplugin:external]
bool is_float_only_struct(const typelib_TypeDescription * type)
~^~

/home/pi/lo/libreoffice/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:168:6:
 error:
externally available entity 'MapReturn' is not previously declared in an 
included file
(if it is only used in this translation unit, make it static; otherwise, 
provide a declaration of it in an included file) [loplugin:external]
void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference * pReturnType, sal_uInt32* pRegisterReturn)


/home/pi/lo/libreoffice/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:446:32:
 error:
static_cast from 'void **' to 'sal_Int32 *' (aka 'long *') is not allowed
sal_Int32 * pTempIndices = static_cast(pCppArgs + nParams);
   ^~~~

or some of these:
In file included from

/home/pi/lo/libreoffice/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c:26:
/usr/lib/jvm/java-11-openjdk-armhf/include/jni.h:1945:1: error: unknown
attribute 'externally_visible' ignored [-Werror,-Wunknown-attributes]
_JNI_IMPORT_OR_EXPORT_ jint JNICALL
^
/usr/lib/jvm/java-11-openjdk-armhf/include/jni.h:1943:32: note: expanded
from macro '_JNI_IMPORT_OR_EXPORT_'
define _JNI_IMPORT_OR_EXPORT_ JNIIMPORT
   ^
/usr/lib/jvm/java-11-openjdk-armhf/include/linux/jni_md.h:35:42: note:
expanded from macro 'JNIIMPORT'
define JNIIMPORT
__attribute__((externally_visible,visibility("default")))

Change-Id: I7cae1c52ee10306da666c9c234b9af7248efd04e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108567
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index 069bb1ee050e..f908d8f63c90 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -23,10 +23,20 @@
 #include 
 #include 
 
+// to deal with gcc specific attribute "externally_visible" used in
+// /usr/lib/jvm/java-11-openjdk-armhf/include/linux/jni_md.h:35
+// via /usr/lib/jvm/java-11-openjdk-armhf/include/jni.h
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-attributes"
+#endif
 #include 
 
 #include 
 #include 
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
 
 #include 
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 9a59044ba8b3..7abaed395488 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -28,7 +28,7 @@
 #include 
 
 #include 
-#include "cppinterfaceproxy.hxx"
+#include 
 #include 
 #include 
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index

[Libreoffice-commits] core.git: bean/native

2018-01-31 Thread Mike Kaganski 
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 0b3ecd909ca337d920cca412d9813851ace55da1
Author: Mike Kaganski 
Date:   Wed Jan 31 10:08:45 2018 +0300

bean: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: Id575db58199f438e95d9c73778cc520c452e1a42
Reviewed-on: https://gerrit.libreoffice.org/48948
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index dd19fe7931b8..5d1bdb0f5cc8 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -17,19 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #if defined _MSC_VER
-#pragma warning(push, 1)
+#pragma warning(push)
+#pragma warning(disable : 4201) /* nonstandard extension used: nameless 
struct/union */
 #endif
 #include 
 #if defined _MSC_VER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/native framework/qa framework/source odk/examples sfx2/source uui/source vbahelper/source

2018-01-14 Thread Andrea Gelmini 
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c  
  |2 +-
 framework/qa/complex/dispatches/checkdispatchapi.java  
  |2 +-
 framework/source/accelerators/presethandler.cxx
  |2 +-
 framework/source/accelerators/storageholder.cxx
  |6 +++---
 framework/source/dispatch/closedispatcher.cxx  
  |4 ++--
 framework/source/dispatch/dispatchprovider.cxx 
  |2 +-
 framework/source/fwe/xml/saxnamespacefilter.cxx
  |2 +-
 framework/source/fwi/jobs/configaccess.cxx 
  |2 +-
 framework/source/jobs/jobdata.cxx  
  |   10 +-
 framework/source/jobs/joburl.cxx   
  |2 +-
 framework/source/layoutmanager/layoutmanager.cxx   
  |2 +-
 framework/source/services/pathsettings.cxx 
  |2 +-
 framework/source/uielement/popuptoolbarcontroller.cxx  
  |4 ++--
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java   
  |6 +++---
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java  
  |4 ++--
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java  
  |2 +-
 
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
 |2 +-
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
 |2 +-
 sfx2/source/bastyp/fltfnc.cxx  
  |2 +-
 sfx2/source/dialog/backingcomp.cxx 
  |2 +-
 uui/source/iahndl.cxx  
  |2 +-
 vbahelper/source/vbahelper/vbadocumentbase.cxx 
  |2 +-
 22 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit cfffb09b3d6d46c500e3be3fe601a4ff6944d40e
Author: Andrea Gelmini 
Date:   Sun Jan 14 12:50:47 2018 +0100

Fix typos

Change-Id: I2a578961837076ebce3c1fb2681b0785d1d490ac
Reviewed-on: https://gerrit.libreoffice.org/47857
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index d425d5e065e8..dd19fe7931b8 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -126,7 +126,7 @@ JNIEXPORT jlong JNICALL 
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
 awt.FreeDrawingSurface(ds);
 
 /* Register own window procedure
-   Do it one times only! Otherwhise
+   Do it one times only! Otherwise
multiple instances will be registered
and calls on such construct produce
a stack overflow.
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java 
b/framework/qa/complex/dispatches/checkdispatchapi.java
index 32786e858364..cceabb4f436c 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -193,7 +193,7 @@ public class checkdispatchapi
 @Test public void checkInterceptorLifeTime() throws Exception
 {
 // Note: It's important for the following test, that aInterceptor will 
be hold alive by the uno reference
-// xInterceptor. Otherwhise we can't check some internal states of 
aInterceptor at the end of this method, because
+// xInterceptor. Otherwise we can't check some internal states of 
aInterceptor at the end of this method, because
 // it was already killed .-)
 
 Interceptor aInterceptor = new Interceptor(m_xMSF);
diff --git a/framework/source/accelerators/presethandler.cxx 
b/framework/source/accelerators/presethandler.cxx
index 3d6047dadaae..b5b309150fd6 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -761,7 +761,7 @@ css::uno::Reference< css::embed::XStorage > 
PresetHandler::impl_openLocalizedPat
 
 // it doesn't matter, if there is a locale fallback or not
 // If creation of storages is allowed, we do it anyway.
-// Otherwhise we have no acc config at all, which can make other trouble.
+// Otherwise we have no acc config at all, which can make other trouble.
 OUString

[Libreoffice-commits] core.git: bean/native extensions/source hwpfilter/source idlc/source include/connectivity l10ntools/source lingucomponent/source sal/osl setup_native/source shell/inc shell/sourc

2017-09-17 Thread Mike Kaganski 
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |3 +
 extensions/source/config/ldap/ldapaccess.hxx  |3 +
 hwpfilter/source/mzstring.cxx |3 +
 idlc/source/options.cxx   |   18 
+-
 include/connectivity/odbc.hxx |3 +
 l10ntools/source/helpmerge.cxx|3 +
 lingucomponent/source/lingutil/lingutil.cxx   |3 +
 sal/osl/w32/backtrace.cxx |3 +
 sal/osl/w32/dllentry.cxx  |   14 
++-
 setup_native/source/win32/customactions/regactivex/regactivex.cxx |3 +
 shell/inc/spsupp/registrar.hpp|3 +
 shell/source/backends/localebe/localebackend.cxx  |3 +
 shell/source/backends/wininetbe/wininetbackend.cxx|3 +
 shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx   |3 +
 shell/source/win32/shlxthandler/ooofilt/propspec.cxx  |3 +
 shell/source/win32/shlxthandler/ooofilt/propspec.hxx  |3 +
 shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |3 +
 shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx|3 +
 shell/source/win32/shlxthandler/util/registry.cxx |3 +
 shell/source/win32/spsupp/registrar.cxx   |1 
 soltools/mkdepend/collectdircontent.hxx   |3 +
 svl/source/config/languageoptions.cxx |3 +
 svl/source/svdde/ddeimp.hxx   |3 +
 sw/source/ui/vba/vbasystem.cxx|3 +
 tools/source/datetime/tdate.cxx   |3 +
 tools/source/datetime/ttime.cxx   |3 +
 tools/source/stream/strmwnt.cxx   |3 +
 vcl/opengl/win/WinDeviceInfo.cxx  |4 ++
 vcl/win/window/keynames.cxx   |3 +
 vcl/win/window/salframe.cxx   |3 +
 winaccessibility/inc/AccObject.hxx|5 ++
 winaccessibility/inc/AccObjectWinManager.hxx  |3 +
 winaccessibility/source/UAccCOM/stdafx.h  |3 +
 xmlhelp/source/cxxhelp/provider/databases.cxx |3 +
 xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx  |3 +
 xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx|3 +
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |3 +
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |3 +
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |3 +
 39 files changed, 118 insertions(+), 26 deletions(-)

New commits:
commit afeff9102c2935139de4efd40fd2286dce396706
Author: Mike Kaganski 
Date:   Sun Sep 17 23:30:37 2017 +0300

Use even more WIN32_LEAN_AND_MEAN

Change-Id: I538fe5b41156366e0e87b3a93e58a3947afd18f5
Reviewed-on: https://gerrit.libreoffice.org/42398
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 177d27630e67..dc3ee5b4bb35 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -20,6 +20,9 @@
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include 
 #if defined _MSC_VER
 #pragma warning(pop)
diff --git a/extensions/source/config/ldap/ldapaccess.hxx 
b/extensions/source/config/ldap/ldapaccess.hxx
index 4b101b371934..7f9cf6673fba 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -25,6 +25,9 @@
 #include 
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include 
 #include 
 #else // !defined WNT
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index e5db9967f827..6b579e47b8f6 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -24,6 +24,9 @@
 #include "mzstring.h"
 
 #ifdef _WIN32
+# if !defined WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
 # include 
 #endif
 #include 
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index b183c2bf6889..cbbd55b895a8 100644
---

[Libreoffice-commits] core.git: bean/native

2016-10-14 Thread Stephan Bergmann 
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |   24 --
 1 file changed, 1 insertion(+), 23 deletions(-)

New commits:
commit 667c9c18973e00e530b25735707b2fa8c1602882
Author: Stephan Bergmann 
Date:   Fri Oct 14 16:26:22 2016 +0200

Revert "Don't use the (win32) jawt_md.h as we don't have that when 
cross-compiling"

This reverts commit db57823374ee65b80cd53c5fd4234ad3bf6e287d, as it causes
loplugin:externandnotdefined under clang-cl, and cross-compiling Windows on
Linux seems a rather dead project for now.

Change-Id: Ia7fd742385fa0d609007f70e5116a99729224f77
Reviewed-on: https://gerrit.libreoffice.org/29835
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 42f7714..300568d 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -25,32 +25,10 @@
 #pragma warning(pop)
 #endif
 
-#define JAWT_GetAWT hidden_JAWT_GetAWT
-#include "jawt.h"
-#undef JAWT_GetAWT
-
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
-/* When cross-compiling to Windows we don't have any Windows JDK
- * available. Copying this short snippet from win32/jawt_md.h can
- * surely not be against its license. The intent is to enable
- * interoperation with real Oracle Java after all. We leave out the
- * informative comments that might have "artistic merit" and be more
- * copyrightable. Use this also for native Windows compilation for
- * simplicity.
- */
-typedef struct jawt_Win32DrawingSurfaceInfo {
-union {
-HWND hwnd;
-HBITMAP hbitmap;
-void* pbits;
-};
-HDC hdc;
-HPALETTE hpalette;
-} JAWT_Win32DrawingSurfaceInfo;
-
-JNIIMPORT unsigned char JNICALL JAWT_GetAWT(JNIEnv *, JAWT *);
+#include "jawt_md.h"
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits