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

[Libreoffice Gerrit user]

 sw/source/core/graphic/ndgrf.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 71021e2f2619ed3c363e1d4cc1cde79bb1f2bd29
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Feb 3 21:16:40 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Feb 5 16:04:54 2019 +0100

    tdf#119661 remove the original URL when removing a graphic link
    
    Change-Id: I8c875202ba8af9cbcd7eb9ce0db78f97d56a07a8
    Reviewed-on: https://gerrit.libreoffice.org/67337
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 6a36bedd0a418ce12543f797ab46f24ee57feb6c)
    Reviewed-on: https://gerrit.libreoffice.org/67349
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 5cfd3ce51508..66b1d56d0d91 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -612,7 +612,7 @@ void SwGrfNode::ReleaseLink()
 {
     if( refLink.is() )
     {
-        const Graphic aLocalGraphic(maGrfObj.GetGraphic());
+        Graphic aLocalGraphic(maGrfObj.GetGraphic());
         const bool bHasOriginalData(aLocalGraphic.IsGfxLink());
 
         {
@@ -624,6 +624,7 @@ void SwGrfNode::ReleaseLink()
 
         getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
         refLink.clear();
+        aLocalGraphic.setOriginURL("");
 
         // #i15508# added extra processing after getting rid of the link. Use whatever is
         // known from the formerly linked graphic to get to a state as close to a directly