From 4897f10beab678494a7c2dfdc140c424154e9f8c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 10 Jun 2015 14:22:26 +0200 Subject: SfxObjectShell::CopyStoragesOfUnknownMediaType: still try to copy Base streams When Base is embedded in a Writer document, we still need this when the document is saved for the first time after embedding. Change-Id: I1103da01838abd4ac1b03dc4d44e10db3ce650bc --- sfx2/source/doc/objstor.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 826d0245a907..2c1649427a23 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3484,12 +3484,11 @@ bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed case SotClipboardFormatId::STARCALC_8: case SotClipboardFormatId::STARCHART_8: case SotClipboardFormatId::STARMATH_8: - case SotClipboardFormatId::STARBASE_8: break; default: { - OSL_ENSURE( aSubElements[nInd] == "Configurations2" || !xTarget->hasByName( aSubElements[nInd] ), + OSL_ENSURE( aSubElements[nInd] == "Configurations2" || nFormat == SotClipboardFormatId::STARBASE_8 || !xTarget->hasByName( aSubElements[nInd] ), "The target storage is an output storage, the element should not exist in the target!\n" ); if ( !xTarget->hasByName( aSubElements[nInd] ) ) -- cgit