[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - xmloff/source

[Libreoffice Gerrit user]

 xmloff/source/core/xmlexp.cxx   |    8 ++++++--
 xmloff/source/text/txtparae.cxx |    8 +-------
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit ddba20f863e9dc638eef493aaaf45e588f7a4576
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Tue Feb 5 16:45:33 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Feb 6 12:51:21 2019 +0100

    tdf#122625: Use solution for tdf#118879 in a more general case
    
    Partially revert commit 36aa3f4d6f9e9da7289ed760cfb1e87600cb6459
    
    Change-Id: Ia554d3e64da2ee620c69bc66b33a6cd305502c64
    Reviewed-on: https://gerrit.libreoffice.org/67418
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit a7da594593eb2d63004a91dc471683713ce9742a)
    Reviewed-on: https://gerrit.libreoffice.org/67422
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 8a918aeeff00..74707b3c6380 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1902,8 +1902,12 @@ bool SvXMLExport::AddEmbeddedXGraphicAsBase64(uno::Reference<graphic::XGraphic>
         Reference<XInputStream> xInputStream(mxGraphicStorageHandler->createInputStream(rxGraphic));
         if (xInputStream.is())
         {
-            XMLBase64Export aBase64Exp(*this);
-            return aBase64Exp.exportOfficeBinaryDataElement(xInputStream);
+            Graphic aGraphic(rxGraphic);
+            if (aGraphic.getOriginURL().isEmpty()) // don't add the base64 if the origin URL is set (image is from an external URL)
+            {
+                XMLBase64Export aBase64Exp(*this);
+                return aBase64Exp.exportOfficeBinaryDataElement(xInputStream);
+            }
         }
     }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index c9d84b5885d0..3d27ac07ffeb 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -120,7 +120,6 @@
 #include <algorithm>
 #include <iterator>
 #include <officecfg/Office/Common.hxx>
-#include <vcl/graph.hxx>
 
 using namespace ::std;
 using namespace ::com::sun::star;
@@ -3179,12 +3178,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
         if (xGraphic.is())
         {
             SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, false, true );
-
-            Graphic aGraphic(xGraphic);
-            if (aGraphic.getOriginURL().isEmpty()) // don't add the base64 if the origin URL is set (image is from an external URL)
-            {
-                GetExport().AddEmbeddedXGraphicAsBase64(xGraphic);
-            }
+            GetExport().AddEmbeddedXGraphicAsBase64(xGraphic);
         }
     }