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

[Miklos Vajna]

 embeddedobj/source/commonembedding/persistence.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 112e5f302e3508de6cf51e7d6ee9420df2b1b723
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 30 15:21:28 2015 +0200

    embeddedobj: allow embedding objects lacking a FileFormatVersion=6800 filter
    
    The "own" filter of Base has FileFormatVersion=6200.
    
    Change-Id: I3bbd28ebcf4d517ea9cefe692b01b688358c51e8

diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 4f1adda..b2cd8ec 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -768,6 +768,10 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl(
     {
         OUString aFilterName = GetFilterName( nStorageFormat );
 
+        // No filter found? Try the older format, e.g. Base has only that.
+        if (aFilterName.isEmpty() && nStorageFormat == SOFFICE_FILEFORMAT_CURRENT)
+            aFilterName = GetFilterName( SOFFICE_FILEFORMAT_60 );
+
         SAL_WARN_IF( aFilterName.isEmpty(), "embeddedobj.common", "Wrong document service name!" );
         if ( aFilterName.isEmpty() )
             throw io::IOException(); // TODO: