summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-06-10 14:22:26 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-10 14:46:07 +0200
commit4897f10beab678494a7c2dfdc140c424154e9f8c (patch)
tree119470a25637076dc304e59f8864887922b398fd
parent23c467fd7a1932015ef209f9db49acd167fd713f (diff)
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
-rw-r--r--sfx2/source/doc/objstor.cxx3
1 files changed, 1 insertions, 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] ) )