summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-12-03 11:31:00 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2010-12-03 11:31:00 +0100
commitad336d156b4b27471896e31fb911808790007531 (patch)
tree41592722d28ca3cf8ff8052c92b68e027b15d8a2 /sw/source/ui/frmdlg
parent6bcbe6006dcf6853cd315c3167b2e5b6efa5b6f9 (diff)
parent6ad930a9e6a25ec36f4672bf833cffa7371d6f9a (diff)
CWS-TOOLING: integrate CWS os144
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..e92cd4e0ae81 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 );
}