[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source svgio/source svx/source

[Armin Le Grand]

 sfx2/source/appl/fileobj.cxx            |    4 +++-
 svgio/source/svgreader/svgimagenode.cxx |   29 ++++++++++++++++++++---------
 svx/source/svdraw/svdograf.cxx          |   10 ++++++++--
 3 files changed, 31 insertions(+), 12 deletions(-)

New commits:
commit bc89d402b3df00c2402ac86896eb2ce4c3f7b7d0
Author: Armin Le Grand <alg at apache.org>
Date:   Fri Jan 17 01:37:00 2014 +0000

    i123042 corrected reload of linked content to have access to it's own path

diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 07db70a..7a1575b 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -349,7 +349,9 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
     else if( !pDownLoadData )
     {
         pStream->Seek( STREAM_SEEK_TO_BEGIN );
-        nRes = pGF->ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter );
+
+        // #123042# for e.g. SVG the path is needed, see same TaskID in svx for more info
+        nRes = pGF->ImportGraphic( rGrf, sFileNm, *pStream, nFilter );
     }
     else
     {
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 5851896..a4646e7 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -241,21 +241,32 @@ namespace svgio
                     else if(maUrl.getLength())
                     {
                         const rtl::OUString& rPath = getDocument().getAbsolutePath();
-                        const rtl::OUString aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl));
 
-                        if(aAbsUrl.getLength())
+                        if(rPath.getLength())
                         {
-                            SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
-                            Graphic aGraphic;
+                            const rtl::OUString aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl));
 
-                            if(GRFILTER_OK == GraphicFilter::GetGraphicFilter()->ImportGraphic(
-                                aGraphic,
-                                aAbsUrl,
-                                aStream))
+                            if(aAbsUrl.getLength())
                             {
-                                extractFromGraphic(aGraphic, aNewTarget, aViewBox, aBitmapEx);
+                                SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
+                                Graphic aGraphic;
+
+                                if(GRFILTER_OK == GraphicFilter::GetGraphicFilter()->ImportGraphic(
+                                    aGraphic,
+                                    aAbsUrl,
+                                    aStream))
+                                {
+                                    extractFromGraphic(aGraphic, aNewTarget, aViewBox, aBitmapEx);
+                                }
                             }
                         }
+                        else
+                        {
+                            // #123042# detect missing path and assert - content will be missing. The
+                            // absolute path to itself needs to be set to correctly import linked
+                            // content in a SVG file
+                            OSL_ENSURE(false, "SVG graphic with internal links is interpreted, but local AbsolutePath is not set: linked content will be missing (!)");
+                        }
                     }
                     else if(maXLink.getLength())
                     {
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 81daa7a..84685b4 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -135,7 +135,6 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter
                             ? pGF->GetImportFormatNumber( aFilterName )
                             : GRFILTER_FORMAT_DONTKNOW;
 
-        String aEmptyStr;
         com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 );
 
         // Room for improvment:
@@ -144,7 +143,14 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter
         // there we should create a new service to provide this data if needed
         aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) );
         aFilterData[ 0 ].Value = Any( sal_True );
-        pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData );
+
+        // #123042# for e.g SVG the path is needed, so hand it over here. I have no real idea
+        // what consequences this may have; maybe this is not handed over by purpose here. Not
+        // handing it over means that any GraphicFormat that internallv needs a path as base
+        // to interpret included links may fail.
+        // Alternatively the path may be set at the result after this call when it is known
+        // that it is a SVG graphic, but only because noone yet tried to interpret it.
+        pGF->ImportGraphic( aGraphic, aFileName, *pInStrm, nFilter, NULL, 0, &aFilterData );
     }
     return aGraphic;
 }