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

[Caolán McNamara]

 sw/source/core/doc/docfld.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2005eb1c0fb2c7170af076a0db9a4e3e1f6892ac
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Aug 19 15:08:35 2016 +0100

    Resolves: tdf#100901 crash pressing tab in r-o document with hyperlink
    
    rather odd union in use here. Trying to call SwTextField::GetStart
    on SwTextINetFormat blows up under visual studio.
    
    Change-Id: Ic8145d7645bd6a68ef19e018311a4de6e6958bcb
    (cherry picked from commit 3196e949bb23a33bdb8700dbe27782e0e6c8f1e6)
    Reviewed-on: https://gerrit.libreoffice.org/28242
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 35e3696..56ef919 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -322,9 +322,11 @@ sal_Int32 SetGetExpField::GetCntPosFromContent() const
         switch( eSetGetExpFieldType )
         {
         case TEXTFIELD:
-        case TEXTINET:
             nRet = CNTNT.pTextField->GetStart();
             break;
+        case TEXTINET:
+            nRet = CNTNT.pTextINet->GetStart();
+            break;
         case TEXTTOXMARK:
             nRet = CNTNT.pTextTOX->GetStart();
             break;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits