[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/canvas

[Stephan Bergmann]

 include/canvas/base/cachedprimitivebase.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d2952c7ad52b3ca7425beec7516ee8130ea683d5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 25 08:27:10 2014 +0100

    -Werror,-Wuninitialized
    
    (in CachedPrimitiveBase ctor: base class 'comphelper::OBaseMutex' is
    uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
    
    Change-Id: I30855a80ad9dbc3fa90e45d51d2a02794033f2f1
    (cherry picked from commit 1f94761288ad5bb1319bb32f845586bbc8c6d1b9)

diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 99b9b91..14b4273 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -40,8 +40,8 @@ namespace canvas
     /** Base class, providing common functionality for implementers of
         the XCachedPrimitive interface.
      */
-    class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase : public CachedPrimitiveBase_Base,
-                                public ::comphelper::OBaseMutex
+    class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase:
+        public comphelper::OBaseMutex, public CachedPrimitiveBase_Base
     {
     public: