[Libreoffice-commits] core.git: editeng/source include/editeng include/svx svx/source
Noel (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 4 13:30:26 UTC 2021
editeng/source/uno/unofield.cxx | 4 ++--
include/editeng/mutxhelp.hxx | 36 ------------------------------------
include/editeng/unofield.hxx | 4 ++--
include/svx/unopage.hxx | 9 +++++----
svx/source/unodraw/unopage.cxx | 2 +-
5 files changed, 10 insertions(+), 45 deletions(-)
New commits:
commit 011d0d0078841a8ccebfdd1b360172314493c750
Author: Noel <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 4 10:43:10 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 4 14:29:36 2021 +0100
remove svx/mutxhelp.hxx
which is a clone of cppu::BaseMutex
Change-Id: I6db266a4b67ac2d8b6c389cd27bf5bc7b9ecc754
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110402
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 59772b594490..081ccec809db 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -249,7 +249,7 @@ sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_
}
SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
-: OComponentHelper( getMutex() )
+: OComponentHelper( m_aMutex )
, mpPropSet(nullptr)
, mnServiceId(nServiceId)
, mpImpl( new SvxUnoFieldData_Impl )
@@ -315,7 +315,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
}
SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAnchor, const OUString& rPresentation, const SvxFieldData* pData ) throw()
-: OComponentHelper( getMutex() )
+: OComponentHelper( m_aMutex )
, mxAnchor( xAnchor )
, mpPropSet(nullptr)
, mnServiceId(text::textfield::Type::UNSPECIFIED)
diff --git a/include/editeng/mutxhelp.hxx b/include/editeng/mutxhelp.hxx
deleted file mode 100644
index 7487fee48e46..000000000000
--- a/include/editeng/mutxhelp.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_EDITENG_MUTXHELP_HXX
-#define INCLUDED_EDITENG_MUTXHELP_HXX
-
-#include <osl/mutex.hxx>
-
-class SvxMutexHelper
-{
-private:
- ::osl::Mutex maMutex;
-
-public:
- ::osl::Mutex& getMutex() { return maMutex; }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index 8eb521066347..173bb4b11121 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -27,7 +27,7 @@
#include <cppuhelper/component.hxx>
#include <editeng/editengdllapi.h>
-#include <editeng/mutxhelp.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <memory>
namespace com::sun::star::beans { class XPropertySetInfo; }
@@ -41,7 +41,7 @@ class SvxFieldData;
css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC SvxUnoTextCreateTextField(
const OUString& ServiceSpecifier );
-class EDITENG_DLLPUBLIC SvxUnoTextField final : public SvxMutexHelper,
+class EDITENG_DLLPUBLIC SvxUnoTextField final : public cppu::BaseMutex,
public ::cppu::OComponentHelper,
public css::text::XTextField,
public css::beans::XPropertySet,
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index a428254f6af7..bff0aa5fd5e3 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/drawing/XShapes3.hpp>
#include <com/sun/star/drawing/XShapeGrouper.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <editeng/mutxhelp.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <svx/svxdllapi.h>
#include <svx/svdobjkind.hxx>
@@ -52,14 +52,15 @@ enum class SdrInventor : sal_uInt32;
#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127)
-class SVXCORE_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper7< css::drawing::XDrawPage,
+class SVXCORE_DLLPUBLIC SvxDrawPage : protected cppu::BaseMutex,
+ public ::cppu::WeakAggImplHelper7< css::drawing::XDrawPage,
css::drawing::XShapeGrouper,
css::drawing::XShapes2,
css::drawing::XShapes3,
css::lang::XServiceInfo,
css::lang::XUnoTunnel,
- css::lang::XComponent>,
- protected SvxMutexHelper
+ css::lang::XComponent>
+
{
protected:
cppu::OBroadcastHelper mrBHelper;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 23fe9dabd1a6..d35b7cc51714 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::drawing;
UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage );
SvxDrawPage::SvxDrawPage(SdrPage* pInPage) // TTTT should be reference
-: mrBHelper(getMutex())
+: mrBHelper(m_aMutex)
,mpPage(pInPage)
,mpModel(&pInPage->getSdrModelFromSdrPage()) // register at broadcaster
,mpView(new SdrView(pInPage->getSdrModelFromSdrPage())) // create (hidden) view
More information about the Libreoffice-commits
mailing list