[Libreoffice-commits] core.git: forms/source

[Tomaž Vajngerl]

 forms/source/component/ImageControl.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 6c6b2c886e2fbb898a369a67b4248efb4b70cfb6
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Mar 15 20:36:32 2018 +0900

    forms: Don't create a GraphicObject URL if we have xGraphic anyway
    
    Change-Id: Ia80df77372ed08abc4ff816515c216c26d8330b4
    Reviewed-on: https://gerrit.libreoffice.org/51326
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index fb9cfb41f062..75020255c08e 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -273,15 +273,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
 
             if ( m_bExternalGraphic )
             {
-                // if that's an external graphic, i.e. one which has not been loaded by ourselves in response to a
-                // new image URL, then also adjust our ImageURL.
-                OUString sNewImageURL;
-                if ( m_xGraphicObject.is() )
-                {
-                    sNewImageURL = "vnd.sun.star.GraphicObject:";
-                    sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID();
-                }
-                m_sImageURL = sNewImageURL;
+                m_sImageURL = OUString();
                 // TODO: speaking strictly, this would need to be notified, since ImageURL is a bound property. However,
                 // this method here is called with a locked mutex, so we cannot simply call listeners ...
                 // I think the missing notification (and thus clients which potentially cannot observe the change)