summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-30 15:21:28 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-30 15:41:25 +0200
commit112e5f302e3508de6cf51e7d6ee9420df2b1b723 (patch)
tree0a702ebc07239704fbb904261a78802562babc29 /embeddedobj
parent2e2b350ff3be19b04f2ae39f9a6b5c7838e2d887 (diff)
embeddedobj: allow embedding objects lacking a FileFormatVersion=6800 filter
The "own" filter of Base has FileFormatVersion=6200. Change-Id: I3bbd28ebcf4d517ea9cefe692b01b688358c51e8
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 4f1addaf406a..b2cd8ecc6717 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: