ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

simplify framework::TitleHelper

Browse Source 
Every callsite (bar one) calls setOwner and connectWithUntitledNumbers after construction,
so just pass them in the constructor.
And for that lone callsite we can just nullptr as an argument.

Change-Id: If838e068bb59a407225d853a0f67983be400f2f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124426
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-10-29 14:28:54 +02:00
parent 2e2931ba2d
commit 8ce81efa73
8 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbaccess/source/core/dataaccess/databasedocument.cxx
+1 -4
View File
@@ -2094,10 +2094,7 @@ Reference< XTitle > const & ODatabaseDocument::impl_getTitleHelper_throw()
Reference< XUntitledNumbers > xDesktop(Desktop::create(m_pImpl->m_aContext), uno::UNO_QUERY_THROW);
Reference< frame::XModel > xThis (getThis(), uno::UNO_QUERY_THROW);
rtl::Reference<::framework::TitleHelper> pHelper = new ::framework::TitleHelper(m_pImpl->m_aContext);
m_xTitleHelper = pHelper;
pHelper->setOwner (xThis );
pHelper->connectWithUntitledNumbers (xDesktop);
m_xTitleHelper = new ::framework::TitleHelper(m_pImpl->m_aContext, xThis, xDesktop);
}
return m_xTitleHelper;
dbaccess/source/ui/browser/genericcontroller.cxx
+1 -5
View File
@@ -1057,11 +1057,7 @@ Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw()
Reference< XUntitledNumbers > xUntitledProvider(getPrivateModel(), UNO_QUERY );
Reference< XController > xThis(static_cast< XController* >(this), UNO_QUERY_THROW);
rtl::Reference<::framework::TitleHelper> pHelper = new ::framework::TitleHelper( m_xContext );
m_xTitleHelper = pHelper;
pHelper->setOwner (xThis );
pHelper->connectWithUntitledNumbers (xUntitledProvider);
m_xTitleHelper = new ::framework::TitleHelper( m_xContext, xThis, xUntitledProvider );
}
return m_xTitleHelper;
framework/source/fwe/helper/titlehelper.cxx
+8 -18
View File
@@ -48,26 +48,21 @@ using namespace css::frame;
namespace framework{
TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XInterface >& xOwner,
const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers)
: ::cppu::BaseMutex ()
, m_xContext (rxContext)
, m_bExternalTitle (false)
, m_nLeasedNumber (css::frame::UntitledNumbersConst::INVALID_NUMBER)
, m_aListener (m_aMutex)
{
}
TitleHelper::~TitleHelper()
{
}
void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner)
{
// SYNCHRONIZED ->
{
osl::MutexGuard aLock(m_aMutex);
m_xOwner = xOwner;
m_xUntitledNumbers = xNumbers;
}
// <- SYNCHRONIZED
@@ -93,6 +88,10 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO
}
}
TitleHelper::~TitleHelper()
{
}
OUString SAL_CALL TitleHelper::getTitle()
{
// SYNCHRONIZED ->
@@ -115,15 +114,6 @@ OUString SAL_CALL TitleHelper::getTitle()
// <- SYNCHRONIZED
}
void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers)
{
// SYNCHRONIZED ->
osl::MutexGuard aLock(m_aMutex);
m_xUntitledNumbers = xNumbers;
// <- SYNCHRONIZED
}
void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
{
// SYNCHRONIZED ->
framework/source/services/frame.cxx
+1 -3
View File
@@ -817,9 +817,7 @@ void SAL_CALL XFrameImpl::initialize( const css::uno::Reference< css::awt::XWind
m_pWindowCommandDispatch.reset(new WindowCommandDispatch(m_xContext, this));
// Initialize title functionality
rtl::Reference<TitleHelper> pTitleHelper = new TitleHelper( m_xContext );
m_xTitleHelper = pTitleHelper;
pTitleHelper->setOwner(xThis);
m_xTitleHelper = new TitleHelper( m_xContext, xThis, nullptr );
}
/*-****************************************************************************************************
include/framework/titlehelper.hxx
+8 -24
View File
@@ -62,16 +62,6 @@ class FWK_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex
public:
/** @short lightweight constructor.
*/
TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
/** @short free all internally used resources.
*/
virtual ~TitleHelper() override;
/** set an outside component which uses this container and must be set
as source of all broadcasted messages, exceptions.
@@ -82,22 +72,16 @@ class FWK_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex
@param xOwner
the new owner of this collection.
*/
void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner);
/** set an outside component which provides the right string and number for
an untitled component.
It's holded weak only so we do not need any complex dispose sessions.
Note: Passing NULL as parameter will be allowed. It will reset the internal
member reference only.
@param xNumbers
the right numbered collection for this helper.
provides the right string and number for an untitled component.
*/
void connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers);
TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XInterface >& xOwner,
const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers);
/** @short free all internally used resources.
*/
virtual ~TitleHelper() override;
/** @see XTitle */
reportdesign/source/core/api/ReportDefinition.cxx
+2 -4
View File
@@ -2490,10 +2490,8 @@ uno::Reference< frame::XTitle > OReportDefinition::impl_getTitleHelper_throw()
uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_aProps->m_xContext);
uno::Reference< frame::XModel > xThis(static_cast< frame::XModel* >(this), uno::UNO_QUERY_THROW);
rtl::Reference<::framework::TitleHelper> pHelper = new ::framework::TitleHelper( m_aProps->m_xContext );
m_pImpl->m_xTitleHelper = pHelper;
pHelper->setOwner (xThis );
pHelper->connectWithUntitledNumbers (uno::Reference<frame::XUntitledNumbers>(xDesktop, uno::UNO_QUERY_THROW));
m_pImpl->m_xTitleHelper = new ::framework::TitleHelper( m_aProps->m_xContext, xThis,
uno::Reference<frame::XUntitledNumbers>(xDesktop, uno::UNO_QUERY_THROW) );
}
return m_pImpl->m_xTitleHelper;
sfx2/source/doc/sfxbasemodel.cxx
+1 -4
View File
@@ -3922,10 +3922,7 @@ Reference< frame::XTitle > SfxBaseModel::impl_getTitleHelper ()
Reference< frame::XUntitledNumbers > xDesktop( frame::Desktop::create(xContext), UNO_QUERY_THROW);
Reference< frame::XModel > xThis (static_cast< frame::XModel* >(this), UNO_QUERY_THROW);
rtl::Reference<::framework::TitleHelper> pHelper = new ::framework::TitleHelper(xContext);
m_pData->m_xTitleHelper = pHelper;
pHelper->setOwner (xThis );
pHelper->connectWithUntitledNumbers (xDesktop);
m_pData->m_xTitleHelper = new ::framework::TitleHelper(xContext, xThis, xDesktop);
}
return m_pData->m_xTitleHelper;
sfx2/source/view/sfxbasecontroller.cxx
+1 -5
View File
@@ -1427,11 +1427,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper ()
Reference< frame::XUntitledNumbers > xUntitledProvider(xModel , uno::UNO_QUERY );
Reference< frame::XController > xThis (static_cast< frame::XController* >(this), uno::UNO_QUERY_THROW);
rtl::Reference<::framework::TitleHelper> pHelper = new ::framework::TitleHelper(::comphelper::getProcessComponentContext());
m_pData->m_xTitleHelper = pHelper;
pHelper->setOwner (xThis );
pHelper->connectWithUntitledNumbers (xUntitledProvider);
m_pData->m_xTitleHelper = new ::framework::TitleHelper(::comphelper::getProcessComponentContext(), xThis, xUntitledProvider);
}
return m_pData->m_xTitleHelper;