diff options
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 | ||||
| -rw-r--r-- | package/source/xstor/owriteablestream.hxx | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 9981e4548c5c..44861baa9361 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -55,7 +55,6 @@ merge OldBasicPassword with basic::SfxScriptLibraryContainer merge OpenGLDeviceInfo with X11OpenGLDeviceInfo merge OpenGLSalBitmapOp with ScaleOp merge PPTExBulletProvider with PPTWriter -merge PreCreationStruct with OWriteStream_Impl merge SalInfoPrinter with PspSalInfoPrinter merge SalInstance with SalGenericInstance merge SalPrinter with PspSalPrinter diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index df1b442aa50e..07bdf3d47d44 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -55,14 +55,11 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -struct PreCreationStruct +struct MutexHolder { const rtl::Reference<SotMutexHolder> m_rMutexRef; - PreCreationStruct() - : m_rMutexRef( new SotMutexHolder ) - {} - + MutexHolder() : m_rMutexRef( new SotMutexHolder ) {} }; namespace package { @@ -76,7 +73,7 @@ typedef ::std::list< OInputCompStream* > InputStreamsList_Impl; struct OStorage_Impl; class OWriteStream; -struct OWriteStream_Impl : public PreCreationStruct +struct OWriteStream_Impl : public MutexHolder { friend struct OStorage_Impl; friend class OWriteStream; |