[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-3-13-g8e73211

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit d19c466c8373b756af5a26999df6230173c075cb
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Apr 12 19:08:09 2012 +0200

    * debian/patches/comphelper-complex-test-fix-jdk7.diff: fix test build with OpenJDK7

diff --git a/changelog b/changelog
index 3a5f35c..fb9e459 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
   * debian/patches/fix-system-lpsolve-build.diff: use -Wl$(COMMA)-rpath as
     otherwise gbuild strips everything after the , away;
     makes it actually set the rpath
+  * debian/patches/comphelper-complex-test-fix-jdk7.diff: fix test build
+    with OpenJDK7
 
   * debian/rules:
     - readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
diff --git a/patches/comphelper-complex-test-fix-jdk7.diff b/patches/comphelper-complex-test-fix-jdk7.diff
new file mode 100644
index 0000000..475dff1
--- /dev/null
+++ b/patches/comphelper-complex-test-fix-jdk7.diff
@@ -0,0 +1,43 @@
+--- a/comphelper/qa/complex/comphelper/Map.java	2012-03-27 18:22:01.000000000 +0200
++++ b/comphelper/qa/complex/comphelper/Map.java	2012-04-12 16:08:17.731593201 +0200
+@@ -151,13 +151,13 @@
+         assertTrue( _context + ": 'clear' does not empty the map", map.hasElements() );
+ 
+         // try the constructor which creates an immutable version
+-        Pair< ?, ? >[] initialMappings = new Pair< ?, ? >[ _keys.length ];
++        Pair[] initialMappings = new Pair[ _keys.length ];
+         for ( int i=0; i<_keys.length; ++i )
+         {
+-            initialMappings[i] = new Pair< Object, Object >( _keys[i], _values[i] );
++            initialMappings[i] = new Pair( _keys[i], _values[i] );
+         }
+         map = com.sun.star.container.EnumerableMap.createImmutable(
+-            connection.getComponentContext(), keyType, valueType, (Pair< Object, Object >[])initialMappings );
++            connection.getComponentContext(), keyType, valueType, (Pair[])initialMappings );
+         impl_ceckContent( map, _keys, _values, _context );
+ 
+         // check the thing is actually immutable
+@@ -405,8 +405,8 @@
+     {
+         public boolean areEqual( Object _lhs, Object _rhs )
+         {
+-            Pair< ?, ? > lhs = (Pair< ?, ? >)_lhs;
+-            Pair< ?, ? > rhs = (Pair< ?, ? >)_rhs;
++            Pair lhs = (Pair)_lhs;
++            Pair rhs = (Pair)_rhs;
+             return lhs.First.equals( rhs.First ) && lhs.Second.equals( rhs.Second );
+         }
+     };
+@@ -464,10 +464,10 @@
+         XEnumerableMap map = com.sun.star.container.EnumerableMap.create( connection.getComponentContext(), new Type( String.class ), new Type( String.class ) );
+         impl_putAll( map, keys, values );
+ 
+-        final Pair< ?, ? >[] paired = new Pair< ?, ? >[ keys.length ];
++        final Pair[] paired = new Pair[ keys.length ];
+         for ( int i=0; i<keys.length; ++i )
+         {
+-            paired[i] = new Pair< Object, Object >( keys[i], values[i] );
++            paired[i] = new Pair( keys[i], values[i] );
+         }
+ 
+         // create non-isolated enumerators, and check their content
diff --git a/patches/series b/patches/series
index 925df7f..131f55d 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ gcc-4.7.diff
 gcc-4.7-i386.diff
 gcc-4.7-amd64.diff
 icu-4.9.diff
+comphelper-complex-test-fix-jdk7.diff

-- 
LibreOffice packaging repository