mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:mergeclasses

Browse Source 
in this case, just rename the baseclass so that it matches the
other places we do this

Change-Id: I21704db7352f72e43636dde9e92c8bef61b7e251
This commit is contained in:
Noel Grandin
2015-10-06 09:09:32 +02:00
parent eed51624b3
commit 8a248d69cc
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -55,7 +55,6 @@ merge OldBasicPassword with basic::SfxScriptLibraryContainer
merge OpenGLDeviceInfo with X11OpenGLDeviceInfo merge OpenGLDeviceInfo with X11OpenGLDeviceInfo
merge OpenGLSalBitmapOp with ScaleOp merge OpenGLSalBitmapOp with ScaleOp
merge PPTExBulletProvider with PPTWriter merge PPTExBulletProvider with PPTWriter
merge PreCreationStruct with OWriteStream_Impl
merge SalInfoPrinter with PspSalInfoPrinter merge SalInfoPrinter with PspSalInfoPrinter
merge SalInstance with SalGenericInstance merge SalInstance with SalGenericInstance
merge SalPrinter with PspSalPrinter merge SalPrinter with PspSalPrinter

9
package/source/xstor/owriteablestream.hxx
View File

@@ -55,14 +55,11 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext; class XComponentContext;
} } } } } } } }
struct PreCreationStruct struct MutexHolder
{ {
const rtl::Reference<SotMutexHolder> m_rMutexRef; const rtl::Reference<SotMutexHolder> m_rMutexRef;
PreCreationStruct() MutexHolder() : m_rMutexRef( new SotMutexHolder ) {}
: m_rMutexRef( new SotMutexHolder )
{}
}; };
namespace package { namespace package {
@@ -76,7 +73,7 @@ typedef ::std::list< OInputCompStream* > InputStreamsList_Impl;
struct OStorage_Impl; struct OStorage_Impl;
class OWriteStream; class OWriteStream;
struct OWriteStream_Impl : public PreCreationStruct struct OWriteStream_Impl : public MutexHolder
{ {
friend struct OStorage_Impl; friend struct OStorage_Impl;
friend class OWriteStream; friend class OWriteStream;