Fix fdo#41995 - true embedding of svg images.

Previously, svg images were always wrapped as .svm metafiles with
a preview graphic. Sucks for interop - so now, we save true svgs
at least for bleeding edge extended odf1.2

3 files changed, 27 insertions, 13 deletions

diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 5c9edab78ea9..226b48d6b8d3 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -1501,17 +1501,14 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath,
             GDIMetaFile     aSVGMtf;
 
             if( 0 == aSVGReader.Read( aSVGMtf ).GetActionSize() )
+            {
                 nStatus = GRFILTER_FILTERERROR;
+            }
             else
+            {
                 rGraphic = Graphic( aSVGMtf );
-
-            // Dont set any GfxLink here, since the MetaRenderGraphicAction
-            // inside the just read MetaFile contains excatly this native data;
-            // setting a ǴfxLink would also affect other program parts, since
-            // GfxLinks are preferably written to the file format in general,
-            // which would be a bad idea in case of SVG files, since earlier
-            // implementations are not able to handle native SVG data in any
-            // case. (KA 01/19/2011)
+                eLinkType = GFX_LINK_TYPE_NATIVE_SVG;
+            }
         }
         else if( aFilterName.EqualsIgnoreCaseAscii( IMP_XBM ) )
         {
diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index f8260b9dfd95..fef8af594ba4 100644
--- a/svx/inc/svx/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
@@ -92,7 +92,8 @@ private:
                                                  const ::rtl::OUString& rPictureStreamName );
     SVX_DLLPRIVATE sal_Bool                 ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName,
                                                   const ::rtl::OUString& rPictureStreamName,
-                                                  const ::rtl::OUString& rGraphicId );
+                                                  const ::rtl::OUString& rGraphicId,
+                                                  bool bUseGfxLink );
     SVX_DLLPRIVATE void                     ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, sal_uInt32 nInsertPos, rtl::OUString& rRequestedFileName );
 
 protected:
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 78e458cf5306..9c47a215fbb0 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -40,6 +40,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/debug.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/gfxlink.hxx>
@@ -581,7 +582,8 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor
 
 sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName,
                                                const ::rtl::OUString& rPictureStreamName,
-                                               const ::rtl::OUString& rGraphicId )
+                                               const ::rtl::OUString& rGraphicId,
+                                               bool bUseGfxLink )
 {
     String          aGraphicId( rGraphicId );
     GraphicObject   aGrfObject( ByteString( aGraphicId, RTL_TEXTENCODING_ASCII_US ) );
@@ -610,7 +612,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
             xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny );
 
             SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
-            if( aGfxLink.GetDataSize() && aGfxLink.GetData() )
+            if( bUseGfxLink && aGfxLink.GetDataSize() && aGfxLink.GetData() )
                 pStream->Write( aGfxLink.GetData(), aGfxLink.GetDataSize() );
             else
             {
@@ -716,6 +718,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
                 Graphic         aGraphic( (Graphic&) aGrfObject.GetGraphic() );
                 const GfxLink   aGfxLink( aGraphic.GetLink() );
                 String          aExtension;
+                bool            bUseGfxLink( true );
 
                 if( aGfxLink.GetDataSize() )
                 {
@@ -729,7 +732,20 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
                         case( GFX_LINK_TYPE_NATIVE_WMF ): aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".wmf" ) ); break;
                         case( GFX_LINK_TYPE_NATIVE_MET ): aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".met" ) ); break;
                         case( GFX_LINK_TYPE_NATIVE_PCT ): aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".pct" ) ); break;
-                        case( GFX_LINK_TYPE_NATIVE_SVG ): aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".svg" ) ); break;
+                        case( GFX_LINK_TYPE_NATIVE_SVG ): 
+                            // backward-compat kludge: since no released OOo
+                            // version to date can handle svg properly, wrap it up
+                            // into an svm. slight catch22 here, since strict ODF
+                            // conformance _recommends_ svg - then again, most old
+                            // ODF consumers are believed to be OOo
+                            if( SvtSaveOptions().GetODFDefaultVersion() <= SvtSaveOptions::ODFVER_012 )
+                            {
+                                bUseGfxLink = false;
+                                aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".svm" ) );
+                            }
+                            else
+                                aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".svg" ) );
+                            break;
 
                         default:
                             aExtension = String( RTL_CONSTASCII_USTRINGPARAM( ".grf" ) );
@@ -779,7 +795,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
                 aStreamName += aExtension;
 
                 if( mbDirect && aStreamName.Len() )
-                    ImplWriteGraphic( aPictureStorageName, aStreamName, aGraphicObjectId );
+                    ImplWriteGraphic( aPictureStorageName, aStreamName, aGraphicObjectId, bUseGfxLink );
 
                 rURLPair.second = sPictures;
                 rURLPair.second += aStreamName;