summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-12-08 12:34:39 +0100
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-12-08 12:35:31 +0100
commit2e2c804b20db136691dcd8a25ceccffceeefd280 (patch)
tree2f575650e37f0808263cbf2d805ff54eb170afbe
parent456ec763d77a238967b866e2f90d1052626c2fdb (diff)
fdo#43521: Don't shown the name of a reference field if it's empty
-rw-r--r--sw/source/core/fields/reffld.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ff29f491b9c0..98111d0850f6 100644
--- 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());
- aStr += ' ';
- aStr += sSetRefName;
- return aStr;
+ if ( GetTyp()->GetName().Len() > 0 || sSetRefName.Len() > 0 )
+ {
+ String aStr(GetTyp()->GetName());
+ aStr += ' ';
+ aStr += sSetRefName;
+ return aStr;
+ }
+ else
+ return Expand();
}
// #i81002# - parameter <pFldTxtAttr> added