connectivity/source/drivers/hsqldb/HDriver.cxx | 2
connectivity/source/drivers/jdbc/JDriver.cxx | 2
cui/source/options/optjava.cxx | 2
desktop/source/migration/services/jvmfwk.cxx | 2
include/jvmfwk/framework.h | 781 -----------------------
include/jvmfwk/framework.hxx | 775 ++++++++++++++++++++++
include/jvmfwk/jvmfwkdllapi.h | 23
include/jvmfwk/jvmfwkdllapi.hxx | 23
jvmfwk/inc/vendorplugin.hxx | 6
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2
jvmfwk/source/elements.hxx | 2
jvmfwk/source/framework.cxx | 2
jvmfwk/source/framework.hxx | 2
stoc/source/javavm/javavm.cxx | 2
svtools/source/java/javainteractionhandler.cxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
16 files changed, 812 insertions(+), 818 deletions(-)
New commits:
commit 7fbe34824dfbe0aee1dc6d82a586723318cdb00c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Mar 9 19:08:12 2016 +0100
cups_dest_s::instance can be null
Change-Id: I7015bd2e13d5bf08cb9181dc9470372f0b3002c0
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 3667e1a..71464d7 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -448,7 +448,7 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
pNewParser = pCUPSParser;
/*int nConflicts =*/ cupsMarkOptions( pPPD,
pDest->num_options, pDest->options );
- SAL_INFO("vcl.unx.print", "processing the following
options for printer " << pDest->name << " (instance " << pDest->instance <<
"):");
+ SAL_INFO("vcl.unx.print", "processing the following
options for printer " << pDest->name << " (instance " << (pDest->instance ==
nullptr ? "null" : pDest->instance) << "):");
for( int k = 0; k < pDest->num_options; k++ )
SAL_INFO("vcl.unx.print",
" \"" << pDest->options[k].name <<
commit 220d9c24d0e81668862010ed3e68e4f46fe9924b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Mar 9 18:51:57 2016 +0100
include/jvmfwk/*.h -> .hxx (only ever included from C++ code)
Change-Id: Ia912e937d5a48afb6f8f5345b20bb7bd517fc4f1
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index fcd14fc..fc4a2ef 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include "TConnection.hxx"
#include "hsqldb/HStorageMap.hxx"
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx
b/connectivity/source/drivers/jdbc/JDriver.cxx
index 611367c..ee61753 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -25,7 +25,7 @@
#include "java/util/Property.hxx"
#include "java/tools.hxx"
#include <connectivity/dbexception.hxx>
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#include "resource/jdbc_log.hrc"
#include "resource/common_res.hrc"
#include "resource/sharedresources.hxx"
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3f178ac..d950c47 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
#if HAVE_FEATURE_JAVA
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#endif
// define ----------------------------------------------------------------
diff --git a/desktop/source/migration/services/jvmfwk.cxx
b/desktop/source/migration/services/jvmfwk.cxx
index d18c8e1..1529b3d 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
#include <com/sun/star/configuration/backend/MalformedDataException.hpp>
#include <com/sun/star/configuration/backend/TemplateIdentifier.hpp>
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#include "jvmfwk.hxx"
#include <stack>
#include <stdio.h>
diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.hxx
similarity index 99%
rename from include/jvmfwk/framework.h
rename to include/jvmfwk/framework.hxx
index dea5ec0..a85e38b 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.hxx
@@ -19,17 +19,15 @@
/** @HTML */
-#ifndef INCLUDED_JVMFWK_FRAMEWORK_H
-#define INCLUDED_JVMFWK_FRAMEWORK_H
+#ifndef INCLUDED_JVMFWK_FRAMEWORK_HXX
+#define INCLUDED_JVMFWK_FRAMEWORK_HXX
-#include <jvmfwk/jvmfwkdllapi.h>
+#include <jvmfwk/jvmfwkdllapi.hxx>
#include <rtl/ustring.h>
#include <osl/mutex.h>
#include "jni.h"
-#ifdef __cplusplus
extern "C" {
-#endif
/** @file
<p>This library can operate in two modes, application mode and direct
mode.</p>
@@ -770,11 +768,7 @@ JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock();
*/
JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock();
-
-#ifdef __cplusplus
}
-#endif
-
#endif
diff --git a/include/jvmfwk/jvmfwkdllapi.h b/include/jvmfwk/jvmfwkdllapi.hxx
similarity index 87%
rename from include/jvmfwk/jvmfwkdllapi.h
rename to include/jvmfwk/jvmfwkdllapi.hxx
index a4919bf..67be38a 100644
--- a/include/jvmfwk/jvmfwkdllapi.h
+++ b/include/jvmfwk/jvmfwkdllapi.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_H
-#define INCLUDED_JVMFWK_JVMFWKDLLAPI_H
+#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_HXX
+#define INCLUDED_JVMFWK_JVMFWKDLLAPI_HXX
#include <sal/types.h>
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 5ebd4c4..a108cb3 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -21,7 +21,7 @@
#ifndef INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
#define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.h>
#include "jni.h"
@@ -74,7 +74,7 @@ typedef enum
<p>
The function allocates memory for an array and all the JavaInfo objects
returned
in <code>parJavaInfo</code>. The caller must free each JavaInfo object by
calling
- <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.h"). The array
is to be
+ <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.hxx"). The array
is to be
freed by rtl_freeMemory.
In case an error occurred <code>parJavaInfo</code> need not be freed.
</p>
@@ -218,7 +218,7 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
<p>
The function allocates memory for all the JavaInfo objects returned
in <code>vecJavaInfosFromPath</code>. The caller must free each JavaInfo
object by calling
- <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.h").
+ <code>jfw_freeJavaInfo</code> (#include "jvmfwk/framework.hxx").
</p>
@param vecVendorInfos
[in] vector specifying the vendor and version requirements that the JRE
must fulfill.
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 449c26b..748b7d7 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -26,7 +26,7 @@
#include "osl/thread.h"
#include "rtl/ustring.hxx"
#include "rtl/byteseq.hxx"
-#include "jvmfwk/framework.h"
+#include "jvmfwk/framework.hxx"
static bool hasOption(char const * szOption, int argc, char** argv);
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 21f48ba..18d50f3 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_JVMFWK_SOURCE_ELEMENTS_HXX
#include <vector>
-#include "jvmfwk/framework.h"
+#include "jvmfwk/framework.hxx"
#include "fwkutil.hxx"
#include "rtl/ustring.hxx"
#include "rtl/byteseq.hxx"
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 4126943..501bf71 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -22,7 +22,7 @@
#include "rtl/bootstrap.hxx"
#include "osl/thread.hxx"
#include "osl/file.hxx"
-#include "jvmfwk/framework.h"
+#include "jvmfwk/framework.hxx"
#include "vendorplugin.hxx"
#include <cassert>
#include <vector>
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 1b4c9ed..5ae25d5 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -21,7 +21,7 @@
#include "rtl/ustring.hxx"
#include "rtl/byteseq.hxx"
-#include "jvmfwk/framework.h"
+#include "jvmfwk/framework.hxx"
#include "vendorplugin.hxx"
/** typedefs for functions from vendorplugin.hxx
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 918707f..78ac585 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -70,7 +70,7 @@
#include <sal/types.h>
#include <uno/current_context.hxx>
#include <uno/environment.h>
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#include "jni.h"
#include <stack>
diff --git a/svtools/source/java/javainteractionhandler.cxx
b/svtools/source/java/javainteractionhandler.cxx
index abdafe4..464f82e 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -32,7 +32,7 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <tools/rcid.h>
-#include <jvmfwk/framework.h>
+#include <jvmfwk/framework.hxx>
#include <svtools/restartdialog.hxx>
#include <svtools/svtresid.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
