sw/source/ui/frmdlg/cption.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit dd629829c78c294ccbc93c885bbaae11bb72b20b
Author: Jack Leigh <leigh...@gmx.se>
Date: Fri Dec 7 15:30:45 2012 +0000
don't display caption number separator on category 'None'
Change-Id: Id01fb900a3e558d5f9d4613e18f3761cf6a670bf
Reviewed-on: https://gerrit.libreoffice.org/1265
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index f9a3f5b..5d7f6eb 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
