fdo#43521: Don't shown the name of a reference field if it's empty

2e2c804b · Cédric Bosdonnat · 456ec763 · 2e2c804b
Kaydet (Commit) 2e2c804b authored Ara 08, 2011 tarafından Cédric Bosdonnat
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

reffld.cxx sw/source/core/fields/reffld.cxx +9 -4

No files found.
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -276,10 +276,15 @@ String SwGetRefField::Expand() const
 String SwGetRefField::GetFieldName() const
 {
-    String aStr(GetTyp()->GetName());
+    if ( GetTyp()->GetName().Len() > 0 || sSetRefName.Len() > 0 )
-    aStr += ' ';
+    {
-    aStr += sSetRefName;
+        String aStr(GetTyp()->GetName());
-    return aStr;
+        aStr += ' ';
+        aStr += sSetRefName;
+        return aStr;
+    }
+    else
+        return Expand();
 }
 // #i81002# - parameter <pFldTxtAttr> added