[Libreoffice-commits] core.git: scripting/java

[Robert Antoni Buj i Gelonch]

 scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1df9d5767b3222cace051a75259dea5d951cbfaf
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Wed Oct 8 18:22:16 2014 +0200

    scripting: as of release 5, 'enum' is a keyword
    
    Change-Id: Ia45890892f3a0fa89b4c1f97a4c169de5e25c593
    Reviewed-on: https://gerrit.libreoffice.org/11860
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>

diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index 1caa883..4a91798 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
@@ -52,11 +52,11 @@ public class OfficeSettings extends SystemOption {
             SVersionRCFile sversion = SVersionRCFile.createInstance();
 
             try {
-                Enumeration enum = sversion.getVersions();
+                Enumeration enumeration = sversion.getVersions();
                 OfficeInstallation oi;
 
-                while (enum.hasMoreElements()) {
-                    oi = (OfficeInstallation)enum.nextElement();
+                while (enumeration.hasMoreElements()) {
+                    oi = (OfficeInstallation)enumeration.nextElement();
                     setOfficeDirectory(oi);
                     return;
                 }