[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

László Németh nemeth at numbertext.org
Tue Jun 18 08:28:10 PDT 2013


 sw/source/ui/dialog/uiregionsw.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f46a894687be63e29d556621c278b909d417f6fc
Author: László Németh <nemeth at numbertext.org>
Date:   Tue Jun 18 17:02:36 2013 +0200

    fdo#65666 keep tab characters in footnote settings of sections, too
    
    Change-Id: I9728ffb7ddae2ca58af083a4748585b0ca8d1437
    Reviewed-on: https://gerrit.libreoffice.org/4341
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index eb0117d..af33f8c 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1926,8 +1926,8 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
     {
     case FTNEND_ATTXTEND_OWNNUMANDFMT:
         aFtn.SetNumType( aFtnNumViewBox.GetSelectedNumberingType() );
-        aFtn.SetPrefix( aFtnPrefixED.GetText() );
-        aFtn.SetSuffix( aFtnSuffixED.GetText() );
+        aFtn.SetPrefix( aFtnPrefixED.GetText().replaceAll("\\t", "\t") ); // fdo#65666
+        aFtn.SetSuffix( aFtnSuffixED.GetText().replaceAll("\\t", "\t") );
         // no break;
 
     case FTNEND_ATTXTEND_OWNNUMSEQ:
@@ -1947,8 +1947,8 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
     {
     case FTNEND_ATTXTEND_OWNNUMANDFMT:
         aEnd.SetNumType( aEndNumViewBox.GetSelectedNumberingType() );
-        aEnd.SetPrefix( aEndPrefixED.GetText() );
-        aEnd.SetSuffix( aEndSuffixED.GetText() );
+        aEnd.SetPrefix( aEndPrefixED.GetText().replaceAll("\\t", "\t") );
+        aEnd.SetSuffix( aEndSuffixED.GetText().replaceAll("\\t", "\t") );
         // no break;
 
     case FTNEND_ATTXTEND_OWNNUMSEQ:
@@ -2017,8 +2017,8 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
 
     pNumViewBox->SelectNumberingType( rAttr.GetNumType() );
     pOffsetFld->SetValue( rAttr.GetOffset() + 1 );
-    pPrefixED->SetText( rAttr.GetPrefix() );
-    pSuffixED->SetText( rAttr.GetSuffix() );
+    pPrefixED->SetText( rAttr.GetPrefix().replaceAll("\t", "\\t") );
+    pSuffixED->SetText( rAttr.GetSuffix().replaceAll("\t", "\\t") );
 
     switch( eState )
     {


More information about the Libreoffice-commits mailing list