[Libreoffice] fix for fdo#33960 "cross reference to a list number, dot bug" makes sw/qa/complex/writer fail

Stephan Bergmann sbergman at redhat.com
Tue Sep 6 10:02:20 PDT 2011


At least with recent git trunk builds, make subsequentcheck fails in sw with

> 1) checkCrossReferences(complex.writer.CheckCrossReferences)
> org.junit.ComparisonFailure: set reference field format doesn't result in correct field result expected:< 1[.]> but was:< 1[]>
> 	at org.junit.Assert.assertEquals(Assert.java:123)
> 	at complex.writer.CheckCrossReferences.checkField(CheckCrossReferences.java:120)
> 	at complex.writer.CheckCrossReferences.checkCrossReferences(CheckCrossReferences.java:176)

This appears to be caused by the fix for 
<https://bugs.freedesktop.org/show_bug.cgi?id=33960> "cross reference to 
a list number, dot bug," which removes the trailing "." from 
SwNumRule::MakeRefNumString.

The question is, is the below patch (which makes that subsequentcheck 
failure go away) right in adapting the failing test to the new code, or 
does this failure actually uncover unwanted side effects of the new code 
(I'm esp. unsure about changing "A. 1." to "A 1")?

> diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.j
> index cc7fcb1..597a14f 100644
> --- a/sw/qa/complex/writer/CheckCrossReferences.java
> +++ b/sw/qa/complex/writer/CheckCrossReferences.java
> @@ -145,9 +145,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;

-Stephan


More information about the LibreOffice mailing list