[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang package/source sw/source

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |    1 -
 package/source/xstor/owriteablestream.hxx  |    9 +++------
 sw/source/ui/index/cnttab.cxx              |    1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 32b9901dae7403453d773f5904de15551a323595
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Oct 6 09:24:25 2015 +0200

    need <numeric> for std::accumulate
    
    Change-Id: Ic7d237ab5e4a7925bf265b8ab495ad3e0c128735

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f5ac0fc..7e06bcc 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -80,6 +80,7 @@
 #include <unomid.h>
 
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <numeric>
 
 
 using namespace ::com::sun::star;
commit 8a248d69cc807ac076c7da13cd69e114f0dde0ce
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Oct 6 09:09:32 2015 +0200

    loplugin:mergeclasses
    
    in this case, just rename the baseclass so that it matches the
    other places we do this
    
    Change-Id: I21704db7352f72e43636dde9e92c8bef61b7e251

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 9981e45..44861ba 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 df1b442..07bdf3d 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;