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

László Németh nemeth at numbertext.org
Thu Jun 13 06:24:29 PDT 2013


 sw/source/ui/misc/docfnote.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0d583c89697cb2349d125becc14bc8a8b56d6bc8
Author: László Németh <nemeth at numbertext.org>
Date:   Wed Jun 12 11:22:27 2013 +0200

    fdo#65666 keep tab characters in footnote settings (Begin/After)
    
    Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa
    Reviewed-on: https://gerrit.libreoffice.org/4235
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 3a59919..4ca616d 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -170,8 +170,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
         // art
     m_pNumViewBox->SelectNumberingType( pInf->aFmt.GetNumberingType());
     m_pOffsetFld->SetValue(pInf->nFtnOffset + 1);
-    m_pPrefixED->SetText(pInf->GetPrefix());
-    m_pSuffixED->SetText(pInf->GetSuffix());
+    m_pPrefixED->SetText(pInf->GetPrefix().replaceAll("\t", "\\t")); // fdo#65666
+    m_pSuffixED->SetText(pInf->GetSuffix().replaceAll("\t", "\\t"));
 
     const SwCharFmt* pCharFmt = pInf->GetCharFmt(
                         *pSh->GetView().GetDocShell()->GetDoc());
@@ -376,8 +376,8 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
 
     pInf->nFtnOffset = static_cast< sal_uInt16 >(m_pOffsetFld->GetValue() -1);
     pInf->aFmt.SetNumberingType(m_pNumViewBox->GetSelectedNumberingType() );
-    pInf->SetPrefix(m_pPrefixED->GetText());
-    pInf->SetSuffix(m_pSuffixED->GetText());
+    pInf->SetPrefix(m_pPrefixED->GetText().replaceAll("\\t", "\t"));
+    pInf->SetSuffix(m_pSuffixED->GetText().replaceAll("\\t", "\t"));
 
     pInf->SetCharFmt( lcl_GetCharFormat( pSh,
                         m_pFtnCharTextTemplBox->GetSelectEntry() ) );


More information about the Libreoffice-commits mailing list