fdo#33960: fix cross reference number test failure

Change-Id: If50a09a14ad30fa3dcb587d6e59a5a0d161394b1

2 files changed, 48 insertions, 37 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
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 939c4472ab93..c43cb61c2427 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -750,6 +750,8 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
     if ( rNodeNum.GetLevelInListTree() >= 0 )
     {
         sal_Bool bOldHadPrefix = sal_True;
+        bool bFirstIteration = true;
+        ::rtl::OUString sOldPrefix;
 
         const SwNodeNum* pWorkingNodeNum( &rNodeNum );
         do
@@ -785,26 +787,44 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
 
                 if (nStrip)
                 {
-                        aPrevStr.Erase( 0, nStrip );
-                        aExtremities.nPrefixChars -= nStrip;
-                        nLen -= nStrip;
+                    aPrevStr.Erase( 0, nStrip );
+                    aExtremities.nPrefixChars -= nStrip;
+                    nLen -= nStrip;
                 }
 
-                if ( bOldHadPrefix &&
+                if ((bFirstIteration || bOldHadPrefix) &&
                      aExtremities.nSuffixChars &&
                      !aExtremities.nPrefixChars
                    )
                 {
-                        aPrevStr.Erase( nLen - aExtremities.nSuffixChars, aExtremities.nSuffixChars );
+                    int nStrip2 = aPrevStr.Len();
+                    while (aPrevStr.Len() - nStrip2 < aExtremities.nSuffixChars)
+                    {
+                        char const cur = aPrevStr.GetChar(nStrip2);
+                        if  (!bFirstIteration && '\t' != cur && ' ' != cur)
+                        {
+                            break;
+                        }
+                        --nStrip2;
+                    }
+                    if (nStrip2 < aPrevStr.Len())
+                    {
+                        aPrevStr.Erase(nStrip2, aPrevStr.Len() - nStrip2);
+                    }
+                }
+                else if (sOldPrefix.getLength())
+                {
+                    aRefNumStr.Insert(sOldPrefix, 0);
                 }
+                sOldPrefix = ::rtl::OUString();
+
                 bOldHadPrefix = ( aExtremities.nPrefixChars >  0);
 
                 aRefNumStr.Insert( aPrevStr, 0 );
-
             }
             else if ( aRefNumStr.Len() > 0 )
             {
-                aRefNumStr.Insert( rtl::OUString(" "), 0 );
+                sOldPrefix += " ";
                 bOldHadPrefix = true;
             }
 
@@ -823,6 +843,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
             {
                 break;
             }
+            bFirstIteration = false;
         } while ( pWorkingNodeNum &&
                   pWorkingNodeNum->GetLevelInListTree() >= 0 &&
                   static_cast<sal_uInt8>(pWorkingNodeNum->GetLevelInListTree()) >= nRestrictInclToThisLevel );