cui/source/tabpages/numfmt.cxx | 5 +----
ucb/source/cacher/cachedcontentresultset.cxx | 13 ++++---------
ucb/source/cacher/cachedcontentresultset.hxx | 10 ++++------
ucb/source/cacher/contentresultsetwrapper.cxx | 23 ++++++++++++++++-------
ucb/source/cacher/contentresultsetwrapper.hxx | 8 ++++++--
5 files changed, 31 insertions(+), 28 deletions(-)
New commits:
commit fe727997949d94cda5e867b7d2f3cb68f7b3a4b8
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 1 08:24:20 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 1 12:15:27 2024 +0200
cid#1615991 Logically dead code
revealed as such since:
commit a1be5ede8e7a8042683efa10b823d952e1bd9513
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 31 07:41:52 2024 +0200
reduce number of GetItem calls
Change-Id: I7856c0cd035f1225f629f8f2d1e275928fabff05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171368
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 584c7acdd5b0..d078e82f9f85 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -422,10 +422,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet
)
if ( const SfxBoolItem* pBoolItem = rSet->GetItemIfSet(
SID_ATTR_NUMBERFORMAT_SOURCE ))
{
- if ( pBoolItem )
- m_xCbSourceFormat->set_active(pBoolItem->GetValue());
- else
- m_xCbSourceFormat->set_active( false );
+ m_xCbSourceFormat->set_active(pBoolItem->GetValue());
m_xCbSourceFormat->set_sensitive(true);
m_xCbSourceFormat->show();
}
commit 04073f55c9eaa7e8049bdc3601ad25f9768a647c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 1 08:58:01 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 1 12:15:16 2024 +0200
cid#1607424 Double unlock
and
cid#1607211 Double unlock
Change-Id: I5d26d0f225cc6ba5b3daf0d8308ddc6c590aa1e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171369
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index 4ae55da582e8..4a554f7ff768 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -1222,25 +1222,20 @@ OUString CachedContentResultSet
XCONTENTACCESS_queryXXX( queryContentIdentifierString,
ContentIdentifierString, OUString )
}
-
// virtual
-Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
- ::queryContentIdentifier()
+Reference<XContentIdentifier> CachedContentResultSet
+ ::queryContentIdentifierImpl(std::unique_lock<std::mutex>& rGuard)
{
- std::unique_lock rGuard(m_aMutex);
XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier,
Reference< XContentIdentifier > )
}
-
// virtual
-Reference< XContent > SAL_CALL CachedContentResultSet
- ::queryContent()
+Reference<XContent> CachedContentResultSet
+ ::queryContentImpl(std::unique_lock<std::mutex>& rGuard)
{
- std::unique_lock rGuard(m_aMutex);
XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > )
}
-
// XResultSet methods. ( inherited )
//virtual
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx
b/ucb/source/cacher/cachedcontentresultset.hxx
index 4bca955ee76e..2c15840479a0 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -228,13 +228,11 @@ public:
virtual OUString
queryContentIdentifierStringImpl(std::unique_lock<std::mutex>& rGuard)
override;
- virtual css::uno::Reference<
- css::ucb::XContentIdentifier > SAL_CALL
- queryContentIdentifier() override;
+ virtual css::uno::Reference<css::ucb::XContentIdentifier>
+ queryContentIdentifierImpl(std::unique_lock<std::mutex>& rGuard) override;
- virtual css::uno::Reference<
- css::ucb::XContent > SAL_CALL
- queryContent() override;
+ virtual css::uno::Reference<css::ucb::XContent>
+ queryContentImpl(std::unique_lock<std::mutex>& rGuard) override;
// XResultSet inherited
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx
b/ucb/source/cacher/contentresultsetwrapper.cxx
index 32cdc98e9c25..a5161f0497e9 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -651,6 +651,7 @@ OUString SAL_CALL
ContentResultSetWrapper::queryContentIdentifierString()
std::unique_lock aGuard(m_aMutex);
return queryContentIdentifierStringImpl(aGuard);
}
+
// virtual
OUString
ContentResultSetWrapper::queryContentIdentifierStringImpl(std::unique_lock<std::mutex>&
rGuard)
{
@@ -664,13 +665,18 @@ OUString
ContentResultSetWrapper::queryContentIdentifierStringImpl(std::unique_l
return m_xContentAccessOrigin->queryContentIdentifierString();
}
-
// virtual
Reference< XContentIdentifier > SAL_CALL
ContentResultSetWrapper::queryContentIdentifier()
{
std::unique_lock aGuard(m_aMutex);
- impl_EnsureNotDisposed(aGuard);
- impl_init_xContentAccessOrigin(aGuard);
+ return queryContentIdentifierImpl(aGuard);
+}
+
+// virtual
+Reference<XContentIdentifier>
ContentResultSetWrapper::queryContentIdentifierImpl(std::unique_lock<std::mutex>&
rGuard)
+{
+ impl_EnsureNotDisposed(rGuard);
+ impl_init_xContentAccessOrigin(rGuard);
if( !m_xContentAccessOrigin.is() )
{
OSL_FAIL( "broadcaster was disposed already" );
@@ -679,13 +685,17 @@ Reference< XContentIdentifier > SAL_CALL
ContentResultSetWrapper::queryContentId
return m_xContentAccessOrigin->queryContentIdentifier();
}
-
// virtual
Reference< XContent > SAL_CALL ContentResultSetWrapper::queryContent()
{
std::unique_lock aGuard(m_aMutex);
- impl_EnsureNotDisposed(aGuard);
- impl_init_xContentAccessOrigin(aGuard);
+ return queryContentImpl(aGuard);
+}
+
+Reference<XContent>
ContentResultSetWrapper::queryContentImpl(std::unique_lock<std::mutex>& rGuard)
+{
+ impl_EnsureNotDisposed(rGuard);
+ impl_init_xContentAccessOrigin(rGuard);
if( !m_xContentAccessOrigin.is() )
{
OSL_FAIL( "broadcaster was disposed already" );
@@ -694,7 +704,6 @@ Reference< XContent > SAL_CALL
ContentResultSetWrapper::queryContent()
return m_xContentAccessOrigin->queryContent();
}
-
// XResultSet methods.
//virtual
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx
b/ucb/source/cacher/contentresultsetwrapper.hxx
index 372779d6e306..c36dc6131785 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -227,10 +227,14 @@ public:
queryContentIdentifierStringImpl(std::unique_lock<std::mutex>& rGuard);
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- queryContentIdentifier() override;
+ queryContentIdentifier() override final;
+ virtual css::uno::Reference< css::ucb::XContentIdentifier >
+ queryContentIdentifierImpl(std::unique_lock<std::mutex>& rGuard);
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- queryContent() override;
+ queryContent() override final;
+ virtual css::uno::Reference<css::ucb::XContent>
+ queryContentImpl(std::unique_lock<std::mutex>& rGuard);
// XResultSet
