diff options
| author | Jack Leigh <leighman@gmx.se> | 2012-12-07 15:30:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-07 16:54:09 +0000 |
| commit | dd629829c78c294ccbc93c885bbaae11bb72b20b (patch) | |
| tree | 3db7f6a831e65728cb779b67ad56f217f22318b2 /sw | |
| parent | 8f45d08f5b918598f1dbeba41ad185edfc446968 (diff) | |
don't display caption number separator on category 'None'
Change-Id: Id01fb900a3e558d5f9d4613e18f3761cf6a670bf
Reviewed-on: https://gerrit.libreoffice.org/1265
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index f9a3f5bb7ab7..5d7f6ebd19b4 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -278,12 +278,17 @@ void SwCaptionDialog::Apply() aOpt.UseCaption() = sal_True; String aName( aCategoryBox.GetText() ); if ( aName == sNone ) + { aOpt.SetCategory( aEmptyStr ); + aOpt.SetNumSeparator( aEmptyStr ); + } else + { aOpt.SetCategory(comphelper::string::strip(aName, ' ')); + aOpt.SetNumSeparator( aNumberingSeparatorED.GetText() ); + } aOpt.SetNumType( (sal_uInt16)(sal_uIntPtr)aFormatBox.GetEntryData( aFormatBox.GetSelectEntryPos() ) ); aOpt.SetSeparator( aSepEdit.IsEnabled() ? aSepEdit.GetText() : String() ); - aOpt.SetNumSeparator( aNumberingSeparatorED.GetText() ); aOpt.SetCaption( aTextEdit.GetText() ); aOpt.SetPos( aPosBox.GetSelectEntryPos() ); aOpt.IgnoreSeqOpts() = sal_True; |