[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - odk/examples

[Stephan Bergmann]

 odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java |   11 ++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 4c67d00cefbe0c80123c13e1a8836e33e7346065
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 26 16:26:57 2017 +0100

    Adapt odk/examples to incompatibly changed (unpublished) API
    
    ...changed with f88f6bcfce233c336c9025d466c5c2fb0b671de3 "Resolves: tdf#35247
    introduce a locale independent numeric field filter".
    
    Makes the example at least compile again.  No idea whether any of the values
    reported by getLocaleIndependentElementNames would actually need to be different
    from those reported by getElementNames for this exampel.
    
    Change-Id: I115096477b28a4ceea398cbbb473a707141d05aa
    (cherry picked from commit d119e3a986a82ce94018c5ac021996ff221f3772)
    Reviewed-on: https://gerrit.libreoffice.org/33592
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
index 830cefa..6b10da9 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
@@ -170,7 +170,7 @@ class ExampleMember implements com.sun.star.container.XNamed,
 
 //  implementation of com.sun.star.sheet.DataPilotSourceMembers
 
-class ExampleMembers implements com.sun.star.container.XNameAccess
+class ExampleMembers implements com.sun.star.sheet.XMembersAccess
 {
     private final ExampleSettings aSettings;
     private ExampleMember[] aMembers;
@@ -224,6 +224,13 @@ class ExampleMembers implements com.sun.star.container.XNameAccess
                 return true;
         return false;
     }
+
+    // XMembersAccess
+
+    public String[] getLocaleIndependentElementNames()
+    {
+        return getElementNames();
+    }
 }
 
 //  implementation of com.sun.star.sheet.DataPilotSourceLevel
@@ -258,7 +265,7 @@ class ExampleLevel implements
 
     // XMembersSupplier
 
-    public com.sun.star.container.XNameAccess getMembers()
+    public com.sun.star.sheet.XMembersAccess getMembers()
     {
         if ( aMembers == null )
             aMembers = new ExampleMembers( aSettings );