fdo#33960: fix cross reference number test failure

Change-Id: If50a09a14ad30fa3dcb587d6e59a5a0d161394b1

1 files changed, 20 insertions, 30 deletions

diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.java
index 77f317930502..ad5831d021a4 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -136,9 +136,9 @@ public class CheckCrossReferences {
             final String FldResult1 = "*i*";
             final String FldResult2 = "+b+*i*";
             final String FldResult3 = "-1-+b+*i*";
-            final String FldResult4 = "1.";
-            final String FldResult5 = " 1.";
-            final String FldResult6 = "A. 1.";
+            final String FldResult4 = "1";
+            final String FldResult5 = "1";
+            final String FldResult6 = "A.1";
 
             // variables for current field
             com.sun.star.text.XTextField xField = null;
@@ -162,33 +162,23 @@ public class CheckCrossReferences {
             checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
             checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
 
-            // The following tests currently fail due to a regression introduced
-            // with the fix for
-            // <https://bugs.freedesktop.org/show_bug.cgi?id=33960> "cross
-            // reference to a list number, dot bug," see thread starting at
-            // <http://lists.freedesktop.org/archives/libreoffice/
-            // 2011-September/017797.html> "[Libreoffice] fix for fdo#33960
-            // 'cross reference to a list number, dot bug' makes
-            // sw/qa/complex/writer fail":
-            if (false) {
-                xField = getNextField();
-                xProps = getFieldProps( xField );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult5 );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
-
-                xField = getNextField();
-                xProps = getFieldProps( xField );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
-
-                xField = getNextField();
-                xProps = getFieldProps( xField );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult6 );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-                checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
-            }
+            xField = getNextField();
+            xProps = getFieldProps( xField );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult5 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+
+            xField = getNextField();
+            xProps = getFieldProps( xField );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+
+            xField = getNextField();
+            xProps = getFieldProps( xField );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
         }
 
         // insert a certain cross-reference bookmark and a reference field to this bookmark