dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 1 -
linguistic/source/convdiclist.cxx | 1 -
sc/source/ui/unoobj/TablePivotCharts.cxx | 1 -
sc/source/ui/unoobj/afmtuno.cxx | 2 --
sc/source/ui/unoobj/appluno.cxx | 1 -
sc/source/ui/unoobj/cellsuno.cxx | 4 ----
sc/source/ui/unoobj/chartuno.cxx | 1 -
sc/source/ui/unoobj/dapiuno.cxx | 5 -----
sc/source/ui/unoobj/datauno.cxx | 2 --
sc/source/ui/unoobj/docuno.cxx | 6 ------
sc/source/ui/unoobj/eventuno.cxx | 1 -
sc/source/ui/unoobj/fielduno.cxx | 2 --
sc/source/ui/unoobj/fmtuno.cxx | 1 -
sc/source/ui/unoobj/linkuno.cxx | 5 -----
sc/source/ui/unoobj/nameuno.cxx | 3 ---
sc/source/ui/unoobj/styleuno.cxx | 2 --
sc/source/ui/unoobj/viewuno.cxx | 1 -
sw/source/uibase/uno/unotxdoc.cxx | 1 -
18 files changed, 40 deletions(-)
New commits:
commit 75b72f5652b9067eee24b1dd76c9076fd9317e28
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 18 16:28:26 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 18 20:14:32 2022 +0200
no need to take a lock when returning static data
Change-Id: I8d836c4a919056e8b600549f82b0d5dee9ab1a47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 3ffa2c6fe6a6..4072002ba326 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -179,7 +179,6 @@ void SAL_CALL OBookmarkContainer::removeContainerListener(
const Reference< XCon
// XElementAccess
Type SAL_CALL OBookmarkContainer::getElementType( )
{
- MutexGuard aGuard(m_rMutex);
return ::cppu::UnoType<OUString>::get();
}
diff --git a/linguistic/source/convdiclist.cxx
b/linguistic/source/convdiclist.cxx
index 396c7427cd3a..6be588ea1a8c 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -163,7 +163,6 @@ uno::Reference< XConversionDictionary >
ConvDicNameContainer::GetByName(
uno::Type SAL_CALL ConvDicNameContainer::getElementType( )
{
- MutexGuard aGuard( GetLinguMutex() );
return cppu::UnoType<XConversionDictionary>::get();
}
diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx
b/sc/source/ui/unoobj/TablePivotCharts.cxx
index 8e9203fe4223..b3a32cd457a0 100644
--- a/sc/source/ui/unoobj/TablePivotCharts.cxx
+++ b/sc/source/ui/unoobj/TablePivotCharts.cxx
@@ -223,7 +223,6 @@ uno::Any SAL_CALL TablePivotCharts::getByIndex(sal_Int32
nIndex)
uno::Type SAL_CALL TablePivotCharts::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XTablePivotChart>::get();
}
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 6507ce6e2ec2..ce0300628ae4 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -285,7 +285,6 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScAutoFormatsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<container::XNamed>::get(); // must match getByIndex
}
@@ -403,7 +402,6 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScAutoFormatObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<beans::XPropertySet>::get(); // must match getByIndex
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 841d9b2f0315..4096c5f4c384 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -570,7 +570,6 @@ uno::Reference<container::XEnumeration> SAL_CALL
ScFunctionListObj::createEnumer
uno::Type SAL_CALL ScFunctionListObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9901466102e4..38289f0108b2 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4488,7 +4488,6 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScCellRangesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XCellRange>::get();
}
@@ -8644,7 +8643,6 @@ uno::Reference<container::XEnumeration> SAL_CALL
ScCellsObj::createEnumeration()
uno::Type SAL_CALL ScCellsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XCell>::get();
}
@@ -8883,7 +8881,6 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScCellFormatsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XCellRange>::get();
}
@@ -9236,7 +9233,6 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XSheetCellRangeContainer>::get();
}
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 03018c6505b0..5f47d853d79e 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -331,7 +331,6 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex
)
uno::Type SAL_CALL ScChartsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XTableChart>::get();
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 10c5ceda27ca..162e8ceb9565 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -499,7 +499,6 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScDataPilotTablesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<XDataPilotTable2>::get();
}
@@ -1580,7 +1579,6 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<XPropertySet>::get();
}
@@ -2851,7 +2849,6 @@ Reference<XEnumeration> SAL_CALL
ScDataPilotFieldGroupsObj::createEnumeration()
uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<XNameAccess>::get();
}
@@ -3024,7 +3021,6 @@ Reference< XEnumeration > SAL_CALL
ScDataPilotFieldGroupObj::createEnumeration()
uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<XNamed>::get();
}
@@ -3176,7 +3172,6 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScDataPilotItemsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<XPropertySet>::get();
}
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 5c6e82faae35..effa5ed50912 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -643,7 +643,6 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XSubTotalField>::get();
}
@@ -2250,7 +2249,6 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScDatabaseRangesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XDatabaseRange>::get();
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6141039d1a06..548f8287f055 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3591,7 +3591,6 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScDrawPagesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<drawing::XDrawPage>::get();
}
@@ -3920,7 +3919,6 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScTableSheetsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XSpreadsheet>::get();
}
@@ -4091,7 +4089,6 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScTableColumnsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XCellRange>::get();
}
@@ -4334,7 +4331,6 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScTableRowsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<table::XCellRange>::get();
}
@@ -4645,7 +4641,6 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScAnnotationsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XSheetAnnotation>::get();
}
@@ -4800,7 +4795,6 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScScenariosObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XScenario>::get();
}
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index 48512812b164..a0acc6e610ec 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -162,7 +162,6 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const
OUString& aName )
uno::Type SAL_CALL ScSheetEventsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
}
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index b7ad6b63a4e8..d79526279d5f 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -360,7 +360,6 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScCellFieldsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<text::XTextField>::get();
}
@@ -511,7 +510,6 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScHeaderFieldsObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<text::XTextField>::get();
}
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 6e815b2f8646..2446ad8e5b50 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -382,7 +382,6 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScTableConditionalFormat::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XSheetConditionalEntry>::get();
}
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 61b095abeab2..c63468cdf61a 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -477,7 +477,6 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScSheetLinksObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<beans::XPropertySet>::get();
}
@@ -979,7 +978,6 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScAreaLinksObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XAreaLink>::get();
}
@@ -1268,7 +1266,6 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScDDELinksObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XDDELink>::get();
}
@@ -1581,7 +1578,6 @@ uno::Reference< container::XEnumeration > SAL_CALL
ScExternalDocLinkObj::createE
uno::Type SAL_CALL ScExternalDocLinkObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XExternalDocLink>::get();
}
@@ -1683,7 +1679,6 @@ uno::Reference< container::XEnumeration > SAL_CALL
ScExternalDocLinksObj::create
uno::Type SAL_CALL ScExternalDocLinksObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XExternalDocLinks>::get();
}
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 9a286bb6d41b..54cadb9e8de7 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -613,7 +613,6 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScNamedRangesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XNamedRange>::get(); // must be suitable for
getByIndex
}
@@ -1148,9 +1147,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScLabelRangesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XLabelRange>::get(); // must be suitable for
getByIndex
-
}
sal_Bool SAL_CALL ScLabelRangesObj::hasElements()
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 01a7e90d63d8..2bcc869ac31a 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -490,7 +490,6 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScStyleFamiliesObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<container::XNameContainer>::get(); // has to fit
to getByIndex
}
@@ -806,7 +805,6 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScStyleFamilyObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<style::XStyle>::get(); // has to fit to getByIndex
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 37fef30cf520..d50a833cfbf8 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -969,7 +969,6 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScTabViewObj::getElementType()
{
- SolarMutexGuard aGuard;
return cppu::UnoType<sheet::XViewPane>::get();
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 1b9690b84dc8..41c1994f47d2 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1321,7 +1321,6 @@ public:
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType() override
{
- SolarMutexGuard aGuard;
return cppu::UnoType<drawing::XDrawPage>::get();
}
