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

[Caolán McNamara]

 sw/source/ui/chrdlg/chardlg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9939b0642afefe96ae33cd964d6726dc405843d
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Aug 31 14:07:42 2016 +0100

    Resolves: tdf#100094 hyperlink tabpage put hyperlink name in wrong field
    
    mismerge of
    
    commit 74593273655e475017bb2bd45aba3c6b132e372d
    Date:   Thu Jan 9 12:59:28 2014 +0000
    
        Resolves: #i123988# assure that hyperlink attribute...
    
    Change-Id: I45391b112666a07a0edfa49b2a8682c446a92cf4
    (cherry picked from commit 98294d715c72751d9dd47fd1995865e04b2bdf5a)
    Reviewed-on: https://gerrit.libreoffice.org/28548
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 860ecf1..2879815 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -213,7 +213,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet)
         m_pURLED->SetText(INetURLObject::decode(pINetFormat->GetValue(),
             INetURLObject::DECODE_UNAMBIGUOUS));
         m_pURLED->SaveValue();
-        m_pURLED->SetText(pINetFormat->GetName());
+        m_pNameED->SetText(pINetFormat->GetName());
 
         OUString sEntry = pINetFormat->GetVisitedFormat();
         if (sEntry.isEmpty())

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