diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/ZipPackage.hxx | 1 | ||||
| -rw-r--r-- | package/source/xstor/xfactory.cxx | 7 | ||||
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 4 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 4 |
4 files changed, 14 insertions, 2 deletions
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index f46eb33b0172..1cb3ba7836f5 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -99,6 +99,7 @@ class ZipPackage final : public cppu::WeakImplHelper const css::uno::Reference < css::uno::XComponentContext > m_xContext; std::unique_ptr<ZipFile> m_pZipFile; + bool m_bDisableFileSync = false; bool isLocalFile() const; diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index 58cff685cd06..1feb44a84e21 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -223,6 +223,13 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr else throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 1 ); } + else if (aDescr[nInd].Name == "NoFileSync") + { + // Forward NoFileSync to the storage. + aPropsToSet.realloc(++nNumArgs); + aPropsToSet[nNumArgs - 1].Name = aDescr[nInd].Name; + aPropsToSet[nNumArgs - 1].Value = aDescr[nInd].Value; + } else OSL_FAIL( "Unacceptable property, will be ignored!" ); } diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 66678d7c378d..21567b8eb2a5 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -429,8 +429,10 @@ void OStorage_Impl::OpenOwnPackage() for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); aInd++ ) { if ( m_xProperties[aInd].Name == "RepairPackage" - || m_xProperties[aInd].Name == "ProgressHandler" ) + || m_xProperties[aInd].Name == "ProgressHandler" + || m_xProperties[aInd].Name == "NoFileSync" ) { + // Forward these to the package. beans::NamedValue aNamedValue( m_xProperties[aInd].Name, m_xProperties[aInd].Value ); aArguments.realloc( ++nArgNum ); diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 3ea75dc409d4..ffb9cf1e8775 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -681,6 +681,8 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) aNamedValue.Value >>= m_bAllowRemoveOnInsert; m_xRootFolder->setRemoveOnInsertMode_Impl( m_bAllowRemoveOnInsert ); } + else if (aNamedValue.Name == "NoFileSync") + aNamedValue.Value >>= m_bDisableFileSync; // for now the progress handler is not used, probably it will never be // if ( aNamedValue.Name == "ProgressHandler" ) @@ -1253,7 +1255,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile() // in case the stream is based on a file it will implement the following interface // the call should be used to be sure that the contents are written to the file system uno::Reference< io::XAsyncOutputMonitor > asyncOutputMonitor( xTempOut, uno::UNO_QUERY ); - if ( asyncOutputMonitor.is() ) + if (asyncOutputMonitor.is() && !m_bDisableFileSync) asyncOutputMonitor->waitForCompletion(); // no need to postpone switching to the new stream since the target was written directly |