summaryrefslogtreecommitdiffstats
path: root/xmerge
diff options
context:
space:
mode:
authorrbuj <robert.buj@gmail.com>2014-07-31 18:47:56 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-08-01 06:34:07 +0000
commitebe8792a37c21637cd9b5dc1522185b49ad7ac1c (patch)
tree174d9bf1b161b13a5f12b370d28eec6b661c4310 /xmerge
parentxmerge: Remove local variable name conflict (diff)
downloadcore-ebe8792a37c21637cd9b5dc1522185b49ad7ac1c.tar.gz
core-ebe8792a37c21637cd9b5dc1522185b49ad7ac1c.zip
xmerge: static non-final variable in the initialization
Change-Id: Ide7ea42e570100766ef4d97fc3c29c5a5028ce37 Reviewed-on: https://gerrit.libreoffice.org/10662 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
index b97f03e4a55d..af82a6670066 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
@@ -26,9 +26,9 @@ package org.openoffice.xmerge;
*/
public final class Version {
- private static Package pkg;
+ private static final Package pkg;
- private static Version version;
+ private static final Version version;
static {