diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-23 14:40:01 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-09-23 07:08:47 -0700 |
| commit | 535a62150bf9d2e12be033ddf7bdd8f761b72f60 (patch) | |
| tree | 2e9f69130068ebfd6a0b240575f19cf8e49d400d /sw/source | |
| parent | 9af79c2fbec31611305bfab99fbac30988a97230 (diff) | |
Do not link html images only when pasting from clipboard (bnc#580834)
Conflicts:
sw/qa/extras/htmlimport/data/picture.html
sw/qa/extras/htmlimport/htmlimport.cxx
Change-Id: I020c4e6ed6d468e553dedd7c91979b081d6b4725
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4052027f6ffb..5f7ca14464b1 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -711,7 +711,8 @@ IMAGE_SETEVENT: sGrfNm = ""; } } - else if (aGraphicURL.GetProtocol() == INET_PROT_FILE) + // sBaseURL is empty if the source is clipboard + else if (sBaseURL.isEmpty()) { if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL)) sGrfNm = ""; |