diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 10:35:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 11:05:06 +0200 |
| commit | bd9f5783abe2ed807c3c70a60e5e00b5d117d820 (patch) | |
| tree | 484897fabee39134a2f74f09641335979c91c2e8 | |
| parent | 76c50eddb0484d687425040f152460ea61af993c (diff) | |
SotStorage ctor nStorageMode param is effectively only used as bool transacted
Change-Id: I3458ae46c256206e31ad268f47e8b92a30f3738e
| -rw-r--r-- | include/sot/storage.hxx | 2 | ||||
| -rw-r--r-- | sot/source/sdstor/storage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 96ede56ae2ac..0116453a3135 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -117,7 +117,7 @@ protected: public: SotStorage( const OUString &, StreamMode = STREAM_STD_READWRITE, - StorageMode = StorageMode::Default ); + bool transacted = false ); SotStorage( bool bUCBStorage, const OUString &, StreamMode = STREAM_STD_READWRITE ); SotStorage( BaseStorage * ); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index df6b5d45197e..caa6c2e34d63 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -333,11 +333,11 @@ SotStorage::SotStorage() #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/content.hxx> -SotStorage::SotStorage( const OUString & rName, StreamMode nMode, StorageMode nStorageMode ) +SotStorage::SotStorage( const OUString & rName, StreamMode nMode, bool transacted ) INIT_SotStorage() { m_aName = rName; // Namen merken - CreateStorage( true, nMode, nStorageMode ); + CreateStorage( true, nMode, transacted ? StorageMode::Transacted : StorageMode::Default ); if ( IsOLEStorage() ) m_nVersion = SOFFICE_FILEFORMAT_50; } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index e6b7c66245f6..ebf8095e6e37 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4842,7 +4842,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, if ( !aURL.endsWithIgnoreAsciiCase( ".dot" ) || ( !sCreatedFrom.isEmpty() && sCreatedFrom.equals( aURL ) ) ) continue; // don't try and read the same document as ourselves - tools::SvRef<SotStorage> rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, StorageMode::Transacted ); + tools::SvRef<SotStorage> rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, true ); BasicProjImportHelper aBasicImporter( *m_pDocShell ); // Import vba via oox filter |