summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
authorAndras Timar <timar@fsf.hu>2010-10-02 09:31:24 +0200
committerAndras Timar <timar@fsf.hu>2010-10-02 09:31:24 +0200
commitd7b3565fe96498d063e33270a9e01477979c86dd (patch)
tree9d35af948250d4e3b707404c95950302e632ca8a /sw/source/ui/frmdlg
parentf4114329580e504680a27f5128b5aad6314c3c91 (diff)
Omit caption separator, if caption text is empty, #i110287#
Diffstat (limited to 'sw/source/ui/frmdlg')
-rw-r--r--sw/source/ui/frmdlg/cption.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 5e620ce6955c..cbae2ae52af1 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -382,6 +382,7 @@ IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG)
void SwCaptionDialog::DrawSample()
{
String aStr;
+ String sCaption = aTextEdit.GetText();
// Nummer
String sFldTypeName = aCategoryBox.GetText();
@@ -436,9 +437,12 @@ void SwCaptionDialog::DrawSample()
}
}
- aStr += aSepEdit.GetText();
+ if( sCaption.Len() > 0 )
+ {
+ aStr += aSepEdit.GetText();
+ }
}
- aStr += aTextEdit.GetText();
+ aStr += sCaption;
// do preview!
aPrevWin.SetPreviewText( aStr );
}