summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-05-09 15:31:55 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-05-10 08:22:25 +0200
commit38371d01e0240825f6d8d419214f50bc193e3e6b (patch)
treea604a31221726bc7a9ad2d92cac0400117f75099 /chart2/source/tools
parentc302027510adb13a2d34d863e417460375588c4b (diff)
Consolidate MutexContainer GetMutex() vs. direct m_aMutex access
...at which point MutexContainer becomes all-inline and need no longer be OOO_DLLPUBLIC_CHARTTOOLS Change-Id: I2f9c089a1189cc8c0fe5cf1760f62e71c5bb7f51 Reviewed-on: https://gerrit.libreoffice.org/72052 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/MutexContainer.cxx32
-rw-r--r--chart2/source/tools/RegressionEquation.cxx4
2 files changed, 2 insertions, 34 deletions
diff --git a/chart2/source/tools/MutexContainer.cxx b/chart2/source/tools/MutexContainer.cxx
deleted file mode 100644
index 7b30db53f0d9..000000000000
--- a/chart2/source/tools/MutexContainer.cxx
+++ /dev/null
@@ -1,32 +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 .
- */
-
-#include <MutexContainer.hxx>
-
-namespace chart
-{
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index d4140691053c..927b06d4b0e9 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -285,13 +285,13 @@ void RegressionEquation::fireModifyEvent()
// ____ XTitle ____
uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText()
{
- MutexGuard aGuard( GetMutex() );
+ MutexGuard aGuard( m_aMutex );
return m_aStrings;
}
void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings )
{
- MutexGuard aGuard( GetMutex() );
+ MutexGuard aGuard( m_aMutex );
ModifyListenerHelper::removeListenerFromAllElements(
ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
m_aStrings = Strings;