basctl/source/accessibility/accessibledialogcontrolshape.cxx | 4 ----
basctl/source/accessibility/accessibledialogwindow.cxx | 2 --
basic/source/uno/namecont.cxx | 4 ----
connectivity/source/drivers/mork/MResultSet.cxx | 7 -------
dbaccess/source/core/dataaccess/databasedocument.cxx | 1 -
sc/source/ui/unoobj/PivotTableDataProvider.cxx | 2 --
sc/source/ui/unoobj/cellsuno.cxx | 2 --
sc/source/ui/unoobj/shapeuno.cxx | 1 -
starmath/source/accessibility.cxx | 1 -
starmath/source/unomodel.cxx | 1 -
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 4 ----
sw/source/core/unocore/unorefmk.cxx | 1 -
12 files changed, 30 deletions(-)
New commits:
commit 4582acb3eeb2af0411ab8598ec17d74381225acf
Author: Noel Grandin <noelgran...@gmail.com>
Date: Sun May 14 18:00:37 2017 +0200
remove some unnecessary locking
Change-Id: I7da9e82930d3fe8f927c495aeca270b8bb5cf65c
Reviewed-on: https://gerrit.libreoffice.org/37602
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index afa2a469c3c6..83b25d5cfa9c 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -307,16 +307,12 @@ Sequence< OUString >
AccessibleDialogControlShape::getSupportedServiceNames()
// XAccessible
Reference< XAccessibleContext >
AccessibleDialogControlShape::getAccessibleContext( )
{
- OExternalLockGuard aGuard( this );
-
return this;
}
// XAccessibleContext
sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount()
{
- OExternalLockGuard aGuard( this );
-
return 0;
}
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 1bde5e6ef245..f04094088e73 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -592,8 +592,6 @@ Sequence< OUString >
AccessibleDialogWindow::getSupportedServiceNames()
// XAccessible
Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext(
)
{
- OExternalLockGuard aGuard( this );
-
return this;
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 4aab96ec6d95..2e60ea4888b9 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2717,25 +2717,21 @@ void SAL_CALL SfxLibraryContainer::disposing()
// Methods XLibraryContainerPassword
sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordProtected( const
OUString& )
{
- LibraryContainerMethodGuard aGuard( *this );
return false;
}
sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordVerified( const
OUString& )
{
- LibraryContainerMethodGuard aGuard( *this );
throw IllegalArgumentException();
}
sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword( const OUString&,
const OUString& )
{
- LibraryContainerMethodGuard aGuard( *this );
throw IllegalArgumentException();
}
void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&,
const OUString&, const OUString& )
{
- LibraryContainerMethodGuard aGuard( *this );
throw IllegalArgumentException();
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx
b/connectivity/source/drivers/mork/MResultSet.cxx
index da0e28facaa8..56ded2df8fd3 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -177,42 +177,36 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32
/*columnIndex*/ )
sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return 0;
}
Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return Sequence< sal_Int8 >();
}
Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return Date();
}
double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return 0.0;
}
float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return 0;
}
sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return 0;
}
@@ -228,7 +222,6 @@ sal_Int32 SAL_CALL OResultSet::getRow( )
sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ )
{
- ResultSetEntryGuard aGuard( *this );
return sal_Int64();
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9a8eb0df0beb..0c42e19325c2 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1999,7 +1999,6 @@ sal_Bool SAL_CALL
ODatabaseDocument::getAllowMacroExecution()
Reference< XEmbeddedScripts > SAL_CALL ODatabaseDocument::getScriptContainer()
{
- DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
return this;
}
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index ce7844e6ee7c..8dcb1e776379 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -700,14 +700,12 @@ uno::Sequence<beans::PropertyValue> SAL_CALL
PivotTableDataProvider::detectArgum
sal_Bool SAL_CALL
PivotTableDataProvider::createDataSequenceByRangeRepresentationPossible(const
OUString& /*aRangeRepresentation*/)
{
- SolarMutexGuard aGuard;
return false;
}
uno::Reference<chart2::data::XDataSequence> SAL_CALL
PivotTableDataProvider::createDataSequenceByRangeRepresentation(const
OUString& /*rRangeRepresentation*/)
{
- SolarMutexGuard aGuard;
uno::Reference<chart2::data::XDataSequence> xDataSequence;
return xDataSequence;
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 54ef310917e9..c5fb3990c77c 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6292,7 +6292,6 @@ void SAL_CALL ScCellObj::removeTextContent( const
uno::Reference<text::XTextCont
uno::Reference<text::XText> SAL_CALL ScCellObj::getText()
{
- SolarMutexGuard aGuard;
return this;
}
@@ -6896,7 +6895,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL
ScTableSheetObj::createCursorBy
uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet()
{
- SolarMutexGuard aGuard;
return this; //!???
}
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index ba0de26e515c..0e59d3f5229c 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1185,7 +1185,6 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const
uno::Reference<text::XTe
uno::Reference<text::XText> SAL_CALL ScShapeObj::getText()
{
- SolarMutexGuard aGuard;
return this;
}
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index dad27759cc61..8dceed77def3 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1595,7 +1595,6 @@ void SmEditAccessible::ClearWin()
// XAccessible
uno::Reference< XAccessibleContext > SAL_CALL
SmEditAccessible::getAccessibleContext( )
{
- SolarMutexGuard aGuard;
return this;
}
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index e08274b82836..54c31dc73ffc 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -902,7 +902,6 @@ sal_Int32 SAL_CALL SmModel::getRendererCount(
const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& /*xOptions*/ )
{
- SolarMutexGuard aGuard;
return 1;
}
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index 17a295c87730..2cba759d59a9 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -122,8 +122,6 @@ Sequence< OUString >
VCLXAccessibleHeaderBarItem::getSupportedServiceNames()
// XAccessible
Reference< XAccessibleContext >
VCLXAccessibleHeaderBarItem::getAccessibleContext()
{
- OExternalLockGuard aGuard( this );
-
return this;
}
@@ -133,8 +131,6 @@ Reference< XAccessibleContext >
VCLXAccessibleHeaderBarItem::getAccessibleContex
sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount()
{
- OExternalLockGuard aGuard( this );
-
return 0;
}
diff --git a/sw/source/core/unocore/unorefmk.cxx
b/sw/source/core/unocore/unorefmk.cxx
index a66d7200b48c..a9a4df177278 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1079,7 +1079,6 @@ SwXMeta::getAnchor()
uno::Reference< text::XText > SAL_CALL
SwXMeta::getText()
{
- SolarMutexGuard g;
return this;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
