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

[Andras Timar]

 sw/source/core/fields/reffld.cxx |    2 +-
 sw/source/core/tox/txmsrt.cxx    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5498f7f5d11250a8425920c71fcb4e2069dc283a
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jun 11 18:29:55 2015 +0200

    tdf#90713 tdf#90925 remove footnote mark from TOC/List of Figures entry
    
    Change-Id: I58ab0fbc6a247c29c77a4e9d7febc11daa4a79c8
    Reviewed-on: https://gerrit.libreoffice.org/16233
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit f20c03acac4774bc99cc8f33271f12aa2a290788)

diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 3916a6c..c943f61 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -502,7 +502,8 @@ TextAndReading SwTOXPara::GetText_Impl() const
         {
             return TextAndReading(static_cast<const SwTextNode*>(pNd)->GetExpandText(
                     nStartIndex,
-                    nEndIndex == -1 ? -1 : nEndIndex - nStartIndex),
+                    nEndIndex == -1 ? -1 : nEndIndex - nStartIndex,
+                    false, false, false, false),
                     OUString());
         }
         break;
commit 343d16a3527dd1d8487af040987095f7199ff010
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jun 11 18:41:18 2015 +0200

    tdf#90926 remove footnote mark from cross reference
    
    Change-Id: I0354bca230395d8061bb6d9ce9f9b7a6229b73a7
    Reviewed-on: https://gerrit.libreoffice.org/16234
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 5956cbcbd4b59186d23a34f9d56892266482f251)

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c845ed0..83b11d5 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -390,7 +390,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
 
             if( nStart != nEnd ) // a section?
             {
-                sText = pTextNd->GetExpandText( nStart, nEnd - nStart );
+                sText = pTextNd->GetExpandText( nStart, nEnd - nStart, false, false, false, false );
 
                 // remove all special characters (replace them with blanks)
                 if( !sText.isEmpty() )