Kaydet (Commit) 913c58ed authored tarafından Mikhail Voitenko's avatar Mikhail Voitenko

#102676# use forcing for UCBStorages

üst 5fcf8e27
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: docfile.cxx,v $ * $RCSfile: docfile.cxx,v $
* *
* $Revision: 1.118 $ * $Revision: 1.119 $
* *
* last change: $Author: mav $ $Date: 2002-09-12 09:44:25 $ * last change: $Author: mav $ $Date: 2002-09-18 12:06:27 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -992,34 +992,18 @@ SvStorage* SfxMedium::GetStorage_Impl( BOOL bUCBStorage ) ...@@ -992,34 +992,18 @@ SvStorage* SfxMedium::GetStorage_Impl( BOOL bUCBStorage )
if ( IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) ) if ( IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) )
{ {
sal_Bool bForceUCB = ( bUCBStorage || UCBStorage::IsStorageFile( pInStream ) );
CreateTempFile(); CreateTempFile();
aStorage = new SvStorage( bForceUCB, aName, nStorOpenMode, bDirect ? 0 : STORAGE_TRANSACTED ); aStorage = new SvStorage( bUCBStorage, aName, nStorOpenMode, bDirect ? 0 : STORAGE_TRANSACTED );
}
else
{
/*
if ( ::utl::LocalFileHelper::IsLocalFile( aLogicName ) &&
( bUCBStorage || UCBStorage::IsStorageFile( pInStream ) ) )
{
// JAR files can't be created on a stream,
// ctor with stream copies the stream to a TempFile and opens it
CloseInStream();
aStorage = new SvStorage( TRUE, aStorageName, nStorOpenMode, bDirect ? 0 : STORAGE_TRANSACTED );
} }
else else
*/
{ {
// create a storage on the stream // create a storage on the stream
aStorage = new SvStorage( pInStream, FALSE ); aStorage = new SvStorage( bUCBStorage, *pInStream );
if ( !aStorage->GetName().Len() ) if ( !aStorage->GetName().Len() )
aStorage->SetName( aStorageName ); aStorage->SetName( aStorageName );
} }
} }
} }
}
else else
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment