desktop/inc/lib/init.hxx | 2
desktop/source/app/check_ext_deps.cxx | 7 +-
desktop/source/app/dispatchwatcher.cxx | 5 +
desktop/source/app/officeipcthread.cxx | 7 +-
desktop/source/app/officeipcthread.hxx | 5 +
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 5 +
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 27 +++++-----
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 3 -
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 5 +
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 2
desktop/source/deployment/gui/dp_gui_updatedata.hxx | 5 +
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 12 ++--
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 13 ++--
desktop/source/deployment/inc/dp_interact.h | 5 +
desktop/source/deployment/manager/dp_commandenvironments.cxx | 5 +
desktop/source/deployment/manager/dp_commandenvironments.hxx | 2
desktop/source/deployment/manager/dp_extensionmanager.cxx | 7 +-
desktop/source/deployment/manager/dp_manager.cxx | 3 -
desktop/source/deployment/manager/dp_manager.h | 8 +-
desktop/source/deployment/registry/component/dp_component.cxx | 13 ++--
desktop/source/deployment/registry/dp_backend.cxx | 21 ++++---
desktop/source/deployment/registry/inc/dp_backend.h | 24 ++++----
desktop/source/deployment/registry/package/dp_package.cxx | 3 -
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 7 +-
desktop/source/lib/init.cxx | 9 +--
desktop/source/lib/lokinteractionhandler.cxx | 5 +
desktop/source/lib/lokinteractionhandler.hxx | 2
desktop/source/migration/migration_impl.hxx | 13 ++--
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 3 -
desktop/source/pkgchk/unopkg/unopkg_shared.h | 5 +
31 files changed, 129 insertions(+), 106 deletions(-)
New commits:
commit b33227d80be9bae4d247db35391698c71d996bc4
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jun 2 16:07:15 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jun 3 08:13:09 2022 +0200
clang-tidy modernize-pass-by-value in desktop
Change-Id: Ie9c1cd41c5944b901f4ec6c1e4ffd8608c063ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135317
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 6132a7a302cc..d9e9faf1eb64 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -239,7 +239,7 @@ namespace desktop {
std::map<size_t, std::shared_ptr<CallbackFlushHandler>>
mpCallbackFlushHandlers;
const int mnDocumentId;
- explicit LibLODocument_Impl(const
css::uno::Reference<css::lang::XComponent>& xComponent,
+ explicit LibLODocument_Impl(css::uno::Reference<css::lang::XComponent>
xComponent,
int nDocumentId);
~LibLODocument_Impl();
};
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index 80c6f044a8c5..712ed6c73bd5 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -51,6 +51,7 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <app.hxx>
+#include <utility>
#include <dp_misc.h>
@@ -75,7 +76,7 @@ class SilentCommandEnv
public:
SilentCommandEnv(
- uno::Reference<uno::XComponentContext> const & xContext,
+ uno::Reference<uno::XComponentContext> xContext,
Desktop* pDesktop );
virtual ~SilentCommandEnv() override;
@@ -97,9 +98,9 @@ public:
SilentCommandEnv::SilentCommandEnv(
- uno::Reference<uno::XComponentContext> const & xContext,
+ uno::Reference<uno::XComponentContext> xContext,
Desktop* pDesktop ):
- mxContext( xContext ),
+ mxContext(std::move( xContext )),
mpDesktop( pDesktop ),
mnLevel( 0 ),
mnProgress( 25 )
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index e4745f6761a5..38150714921f 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -63,6 +63,7 @@
#include <osl/file.hxx>
#include <iostream>
#include <string_view>
+#include <utility>
using namespace ::osl;
using namespace ::com::sun::star::uno;
@@ -84,8 +85,8 @@ namespace {
struct DispatchHolder
{
- DispatchHolder( const URL& rURL, Reference< XDispatch > const & rDispatch
) :
- aURL( rURL ), xDispatch( rDispatch ) {}
+ DispatchHolder( URL _aURL, Reference< XDispatch > const & rDispatch ) :
+ aURL(std::move( _aURL )), xDispatch( rDispatch ) {}
URL aURL;
Reference< XDispatch > xDispatch;
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 5937d1097cff..a29944013711 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -31,6 +31,7 @@
#include <salhelper/thread.hxx>
#include <sal/log.hxx>
#include <unotools/bootstrap.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <unotools/configmgr.hxx>
#include <osl/pipe.hxx>
@@ -100,7 +101,7 @@ namespace {
class Parser: public CommandLineArgs::Supplier {
public:
- explicit Parser(OString const & input): m_input(input) {
+ explicit Parser(OString input): m_input(std::move(input)) {
if (!m_input.match(ARGUMENT_PREFIX) ||
m_input.getLength() == RTL_CONSTASCII_LENGTH(ARGUMENT_PREFIX))
{
@@ -378,8 +379,8 @@ public:
static RequestHandler::Status enable(rtl::Reference<IpcThread> * thread);
private:
- explicit PipeIpcThread(osl::Pipe const & pipe):
- IpcThread("PipeIPC"), pipe_(pipe)
+ explicit PipeIpcThread(osl::Pipe pipe):
+ IpcThread("PipeIPC"), pipe_(std::move(pipe))
{}
virtual ~PipeIpcThread() override {}
diff --git a/desktop/source/app/officeipcthread.hxx
b/desktop/source/app/officeipcthread.hxx
index a1de351bc7f5..a233c18e012b 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -21,6 +21,7 @@
#include <sal/config.h>
+#include <utility>
#include <vector>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -42,8 +43,8 @@ oslSignalAction SalMainPipeExchangeSignal_impl(void*
/*pData*/, oslSignalInfo* p
// that was given by command line or by IPC pipe communication.
struct ProcessDocumentsRequest
{
- explicit ProcessDocumentsRequest(std::optional< OUString > const & cwdUrl):
- aCwdUrl(cwdUrl), pcProcessed( nullptr ), bTextCat( false ),
bScriptCat( false ) {}
+ explicit ProcessDocumentsRequest(std::optional< OUString > cwdUrl):
+ aCwdUrl(std::move(cwdUrl)), pcProcessed( nullptr ), bTextCat( false ),
bScriptCat( false ) {}
std::optional< OUString > aCwdUrl;
OUString aModule;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 9d06ebbc9916..7fd0bdac3296 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -34,6 +34,7 @@
#include <fpicker/strings.hrc>
+#include <utility>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
@@ -1357,8 +1358,8 @@ ShowLicenseDialog::~ShowLicenseDialog()
// UpdateRequiredDialogService
UpdateRequiredDialogService::UpdateRequiredDialogService( SAL_UNUSED_PARAMETER
uno::Sequence< uno::Any > const&,
- uno::Reference<
uno::XComponentContext > const& xComponentContext )
- : m_xComponentContext( xComponentContext )
+ uno::Reference<
uno::XComponentContext > xComponentContext )
+ : m_xComponentContext(std::move( xComponentContext ))
{
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 0e9818156bd2..a11ff494e35a 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -250,7 +250,7 @@ class UpdateRequiredDialogService : public
::cppu::WeakImplHelper< css::ui::dial
css::uno::Reference< css::uno::XComponentContext > const
m_xComponentContext;
public:
UpdateRequiredDialogService( css::uno::Sequence< css::uno::Any > const &
args,
- css::uno::Reference<
css::uno::XComponentContext> const & xComponentContext );
+ css::uno::Reference<
css::uno::XComponentContext> xComponentContext );
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 30cfe9e3cca3..fd70b79822ca 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -55,6 +55,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/anytostring.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -127,12 +128,12 @@ public:
will be handled and in the second case a VersionException will be handled.
*/
- ProgressCmdEnv( const uno::Reference< uno::XComponentContext >& rContext,
+ ProgressCmdEnv( uno::Reference< uno::XComponentContext > xContext,
DialogHelper* pDialogHelper,
- const OUString& rTitle )
- : m_xContext( rContext )
+ OUString aTitle )
+ : m_xContext(std::move( xContext ))
, m_pDialogHelper( pDialogHelper )
- , m_sTitle( rTitle )
+ , m_sTitle(std::move( aTitle ))
, m_bWarnUser( false )
, m_nCurrentProgress(0)
{}
@@ -171,18 +172,18 @@ struct ExtensionCmd
std::vector< uno::Reference< deployment::XPackage > >
m_vExtensionList;
ExtensionCmd( const E_CMD_TYPE eCommand,
- const OUString &rExtensionURL,
- const OUString &rRepository,
+ OUString aExtensionURL,
+ OUString aRepository,
const bool bWarnUser )
: m_eCmdType( eCommand ),
m_bWarnUser( bWarnUser ),
- m_sExtensionURL( rExtensionURL ),
- m_sRepository( rRepository ) {};
+ m_sExtensionURL(std::move( aExtensionURL )),
+ m_sRepository(std::move( aRepository )) {};
ExtensionCmd( const E_CMD_TYPE eCommand,
- const uno::Reference< deployment::XPackage > &rPackage )
+ uno::Reference< deployment::XPackage > xPackage )
: m_eCmdType( eCommand ),
m_bWarnUser( false ),
- m_xPackage( rPackage ) {};
+ m_xPackage(std::move( xPackage )) {};
ExtensionCmd( const E_CMD_TYPE eCommand,
std::vector<uno::Reference<deployment::XPackage >
>&&vExtensionList )
: m_eCmdType( eCommand ),
@@ -200,7 +201,7 @@ class ExtensionCmdQueue::Thread: public salhelper::Thread
public:
Thread( DialogHelper *pDialogHelper,
TheExtensionManager *pManager,
- const uno::Reference< uno::XComponentContext > & rContext );
+ uno::Reference< uno::XComponentContext > xContext );
void addExtension( const OUString &rExtensionURL,
const OUString &rRepository,
@@ -580,9 +581,9 @@ void ProgressCmdEnv::pop()
ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper,
TheExtensionManager *pManager,
- const uno::Reference<
uno::XComponentContext > & rContext ) :
+ uno::Reference< uno::XComponentContext >
xContext ) :
salhelper::Thread( "dp_gui_extensioncmdqueue" ),
- m_xContext( rContext ),
+ m_xContext(std::move( xContext )),
m_pDialogHelper( pDialogHelper ),
m_pManager( pManager ),
m_sEnablingPackages( DpResId( RID_STR_ENABLING_PACKAGES ) ),
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index a60fffd50bc2..d30d24f79166 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -38,6 +38,7 @@
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
+#include <utility>
#include <vcl/event.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/svapp.hxx>
@@ -58,7 +59,7 @@ struct FindWeakRef
{
const uno::Reference<deployment::XPackage> m_extension;
- explicit FindWeakRef( uno::Reference<deployment::XPackage> const & ext):
m_extension(ext) {}
+ explicit FindWeakRef( uno::Reference<deployment::XPackage> ext):
m_extension(std::move(ext)) {}
bool operator () (uno::WeakReference< deployment::XPackage > const & ref);
};
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 46bccc9df411..5ee3f53c653d 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <utility>
#include <vcl/svapp.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -53,10 +54,10 @@ namespace dp_gui {
// TheExtensionManager
-TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow >
&xParent,
+TheExtensionManager::TheExtensionManager( uno::Reference< awt::XWindow >
xParent,
const uno::Reference<
uno::XComponentContext > &xContext ) :
m_xContext( xContext ),
- m_xParent( xParent ),
+ m_xParent(std::move( xParent )),
m_bModified(false),
m_bExtMgrDialogExecuting(false)
{
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 914cc15d477c..13c329d6d142 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -59,7 +59,7 @@ private:
public:
static ::rtl::Reference<TheExtensionManager> s_ExtMgr;
- TheExtensionManager( const css::uno::Reference< css::awt::XWindow >
&xParent,
+ TheExtensionManager( css::uno::Reference< css::awt::XWindow > xParent,
const css::uno::Reference<
css::uno::XComponentContext > &xContext );
virtual ~TheExtensionManager() override;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index a3d82fa61965..efac4c587bc6 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -21,6 +21,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
+#include <utility>
namespace com::sun::star::deployment {
class XPackage;
@@ -34,8 +35,8 @@ namespace dp_gui {
struct UpdateData
{
- explicit UpdateData( css::uno::Reference< css::deployment::XPackage >
const & aExt):
- bIsShared(false), aInstalledPackage(aExt) {};
+ explicit UpdateData( css::uno::Reference< css::deployment::XPackage >
xExt):
+ bIsShared(false), aInstalledPackage(std::move(xExt)) {};
//When entries added to the listbox then there can be one for the user
update and one
//for the shared update. However, both list entries will contain the same
UpdateData.
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index d86f84c44960..b1070cfe10ae 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -117,13 +117,13 @@ struct UpdateDialog::IgnoredUpdate {
OUString sExtensionID;
OUString sVersion;
- IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion );
+ IgnoredUpdate( OUString axtensionID, OUString aersion );
};
-UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID,
const OUString &rVersion ):
- sExtensionID( rExtensionID ),
- sVersion( rVersion )
+UpdateDialog::IgnoredUpdate::IgnoredUpdate( OUString aExtensionID, OUString
aVersion ):
+ sExtensionID(std::move( aExtensionID )),
+ sVersion(std::move( aVersion ))
{}
@@ -134,11 +134,11 @@ struct UpdateDialog::Index
sal_uInt16 m_nIndex;
OUString m_aName;
- Index( Kind theKind, sal_uInt16 nIndex, const OUString &rName ) :
+ Index( Kind theKind, sal_uInt16 nIndex, OUString aName ) :
m_eKind( theKind ),
m_bIgnored( false ),
m_nIndex( nIndex ),
- m_aName( rName ) {}
+ m_aName(std::move( aName )) {}
};
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 285cff67c2cf..974e7d020ad9 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -23,6 +23,7 @@
#include <sal/config.h>
#include <osl/file.hxx>
#include <cppuhelper/exc_hlp.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
@@ -102,8 +103,8 @@ class UpdateCommandEnv
css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- UpdateCommandEnv( css::uno::Reference< css::uno::XComponentContext > const
& xCtx,
- ::rtl::Reference<UpdateInstallDialog::Thread>const & thread);
+ UpdateCommandEnv( css::uno::Reference< css::uno::XComponentContext > xCtx,
+ ::rtl::Reference<UpdateInstallDialog::Thread> thread);
// XCommandEnvironment
virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
@@ -578,10 +579,10 @@ bool UpdateInstallDialog::Thread::download(OUString const
& sDownloadURL, Update
return m_stop;
}
-UpdateCommandEnv::UpdateCommandEnv( css::uno::Reference<
css::uno::XComponentContext > const & xCtx,
- ::rtl::Reference<UpdateInstallDialog::Thread>const & thread)
- : m_installThread(thread),
- m_xContext(xCtx)
+UpdateCommandEnv::UpdateCommandEnv( css::uno::Reference<
css::uno::XComponentContext > xCtx,
+ ::rtl::Reference<UpdateInstallDialog::Thread> thread)
+ : m_installThread(std::move(thread)),
+ m_xContext(std::move(xCtx))
{
}
diff --git a/desktop/source/deployment/inc/dp_interact.h
b/desktop/source/deployment/inc/dp_interact.h
index 20e486c37412..6a041d99f179 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -24,6 +24,7 @@
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/task/XAbortChannel.hpp>
+#include <utility>
#include "dp_misc_api.hxx"
namespace dp_misc
@@ -124,9 +125,9 @@ public:
const ::rtl::Reference<AbortChannel> m_abortChannel;
public:
Chain(
- ::rtl::Reference<AbortChannel> const & abortChannel,
+ ::rtl::Reference<AbortChannel> abortChannel,
css::uno::Reference<css::task::XAbortChannel> const & xNext )
- : m_abortChannel( abortChannel )
+ : m_abortChannel(std::move( abortChannel ))
{ if (m_abortChannel.is()) m_abortChannel->m_xNext = xNext; }
~Chain()
{ if (m_abortChannel.is()) m_abortChannel->m_xNext.clear(); }
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx
b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 755657a9d21e..0a25e042f0e9 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <utility>
#include "dp_commandenvironments.hxx"
#include <osl/diagnose.h>
@@ -154,8 +155,8 @@ void TmpRepositoryCommandEnv::handle(
LicenseCommandEnv::LicenseCommandEnv(
css::uno::Reference< css::task::XInteractionHandler> const & handler,
bool bSuppressLicense,
- OUString const & repository):
- BaseCommandEnv(handler), m_repository(repository),
+ OUString repository):
+ BaseCommandEnv(handler), m_repository(std::move(repository)),
m_bSuppressLicense(bSuppressLicense)
{
}
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx
b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 4251d081bcfd..6533d45b4fc3 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -88,7 +88,7 @@ public:
LicenseCommandEnv(
css::uno::Reference< css::task::XInteractionHandler> const & handler,
bool bSuppressLicense,
- OUString const & repository);
+ OUString repository);
// XInteractionHandler
virtual void SAL_CALL handle(
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 3466a818b870..fc7816f6a4c6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <comphelper/sequence.hxx>
+#include <utility>
#include <xmlscript/xml_helper.hxx>
#include <osl/diagnose.h>
#include <dp_interact.h>
@@ -125,9 +126,9 @@ class ExtensionRemoveGuard
public:
ExtensionRemoveGuard(){};
ExtensionRemoveGuard(
- css::uno::Reference<css::deployment::XPackage> const & extension,
- css::uno::Reference<css::deployment::XPackageManager> const &
xPackageManager):
- m_extension(extension), m_xPackageManager(xPackageManager) {}
+ css::uno::Reference<css::deployment::XPackage> extension,
+ css::uno::Reference<css::deployment::XPackageManager> xPackageManager):
+ m_extension(std::move(extension)),
m_xPackageManager(std::move(xPackageManager)) {}
~ExtensionRemoveGuard();
void set(css::uno::Reference<css::deployment::XPackage> const & extension,
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 2f0cecc470fa..68765a63fe26 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -41,6 +41,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <comphelper/logging.hxx>
#include <comphelper/sequence.hxx>
+#include <utility>
#include <xmlscript/xml_helper.hxx>
#include <svl/inettype.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -85,7 +86,7 @@ namespace {
struct MatchTempDir
{
OUString m_str;
- explicit MatchTempDir( OUString const & str ) : m_str( str ) {}
+ explicit MatchTempDir( OUString str ) : m_str(std::move( str )) {}
bool operator () ( ActivePackages::Entries::value_type const & v ) const {
return v.second.temporaryName.equalsIgnoreAsciiCase( m_str );
}
diff --git a/desktop/source/deployment/manager/dp_manager.h
b/desktop/source/deployment/manager/dp_manager.h
index 56a48420e355..a2079da23adc 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -28,6 +28,7 @@
#include <com/sun/star/deployment/XPackageManager.hpp>
#include <memory>
#include <string_view>
+#include <utility>
namespace dp_manager {
@@ -116,11 +117,10 @@ class PackageManagerImpl final : private cppu::BaseMutex,
public t_pm_helper
virtual ~PackageManagerImpl() override;
PackageManagerImpl(
- css::uno::Reference<css::uno::XComponentContext>
- const & xComponentContext, OUString const & context )
+ css::uno::Reference<css::uno::XComponentContext> xComponentContext,
OUString context )
: t_pm_helper( m_aMutex ),
- m_xComponentContext( xComponentContext ),
- m_context( context ),
+ m_xComponentContext(std::move( xComponentContext )),
+ m_context(std::move( context )),
m_readOnly( true )
{}
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 6aad3b1d2419..b9aa6518a092 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -33,6 +33,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <ucbhelper/content.hxx>
#include <comphelper/sequence.hxx>
+#include <utility>
#include <xmlscript/xml_helper.hxx>
#include <svl/inettype.hxx>
#include <tools/diagnose_ex.h>
@@ -143,7 +144,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
::rtl::Reference<PackageRegistryBackend> const & myBackend,
OUString const & url, OUString const & name,
Reference<deployment::XPackageTypeInfo> const & xPackageType,
- OUString const & loader, bool bRemoved,
+ OUString loader, bool bRemoved,
OUString const & identifier);
};
friend class ComponentPackageImpl;
@@ -211,7 +212,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
::rtl::Reference<PackageRegistryBackend> const & myBackend,
OUString const & url, OUString const & name,
Reference<deployment::XPackageTypeInfo> const & xPackageType,
- bool bRemoved, OUString const & identifier, OUString const&
rPlatform);
+ bool bRemoved, OUString const & identifier, OUString platform);
private:
BackendImpl * getMyBackend() const;
@@ -335,11 +336,11 @@ BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
OUString const & url, OUString const & name,
Reference<deployment::XPackageTypeInfo> const & xPackageType,
- OUString const & loader, bool bRemoved,
+ OUString loader, bool bRemoved,
OUString const & identifier)
: Package( myBackend, url, name, name /* display-name */,
xPackageType, bRemoved, identifier),
- m_loader( loader ),
+ m_loader(std::move( loader )),
m_registered( Reg::Uninit )
{}
@@ -1523,9 +1524,9 @@
BackendImpl::OtherPlatformPackageImpl::OtherPlatformPackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
OUString const & url, OUString const & name,
Reference<deployment::XPackageTypeInfo> const & xPackageType,
- bool bRemoved, OUString const & identifier, OUString const& rPlatform)
+ bool bRemoved, OUString const & identifier, OUString platform)
: Package(myBackend, url, name, name, xPackageType, bRemoved, identifier)
- , m_aPlatform(rPlatform)
+ , m_aPlatform(std::move(platform))
{
OSL_PRECOND(bRemoved, "this class can only be used for removing
packages!");
}
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index ce37da6280fd..2a681fe87e7d 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -45,6 +45,7 @@
#include <tools/diagnose_ex.h>
#include <unotools/tempfile.hxx>
#include <optional>
+#include <utility>
using namespace ::dp_misc;
using namespace ::com::sun::star;
@@ -297,21 +298,21 @@ Package::~Package()
}
-Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
- OUString const & url,
- OUString const & rName,
- OUString const & displayName,
+Package::Package( ::rtl::Reference<PackageRegistryBackend> myBackend,
+ OUString url,
+ OUString aName,
+ OUString displayName,
Reference<deployment::XPackageTypeInfo> const & xPackageType,
bool bRemoved,
- OUString const & identifier)
+ OUString identifier)
: t_PackageBase( m_aMutex ),
- m_myBackend( myBackend ),
- m_url( url ),
- m_name( rName ),
- m_displayName( displayName ),
+ m_myBackend(std::move( myBackend )),
+ m_url(std::move( url )),
+ m_name(std::move( aName )),
+ m_displayName(std::move( displayName )),
m_xPackageType( xPackageType ),
m_bRemoved(bRemoved),
- m_identifier(identifier)
+ m_identifier(std::move(identifier))
{
if (m_bRemoved)
{
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h
b/desktop/source/deployment/registry/inc/dp_backend.h
index e6dd949f1b23..0fe39db4571d 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -31,6 +31,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <unordered_map>
#include <strings.hrc>
+#include <utility>
namespace dp_registry::backend
{
@@ -85,14 +86,13 @@ protected:
= 0;
virtual ~Package() override;
- Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
- OUString const & url,
- OUString const & name,
- OUString const & displayName,
- css::uno::Reference<css::deployment::XPackageTypeInfo> const &
- xPackageType,
+ Package( ::rtl::Reference<PackageRegistryBackend> myBackend,
+ OUString url,
+ OUString name,
+ OUString displayName,
+ css::uno::Reference<css::deployment::XPackageTypeInfo> const &
xPackageType,
bool bRemoved,
- OUString const & identifier);
+ OUString identifier);
public:
@@ -104,11 +104,11 @@ public:
const OUString m_shortDescr;
public:
virtual ~TypeInfo() override;
- TypeInfo( OUString const & mediaType,
- OUString const & fileFilter,
- OUString const & shortDescr )
- : m_mediaType(mediaType), m_fileFilter(fileFilter),
- m_shortDescr(shortDescr)
+ TypeInfo( OUString mediaType,
+ OUString fileFilter,
+ OUString shortDescr )
+ : m_mediaType(std::move(mediaType)),
m_fileFilter(std::move(fileFilter)),
+ m_shortDescr(std::move(shortDescr))
{}
// XPackageTypeInfo
virtual OUString SAL_CALL getMediaType() override;
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index 04ef763b070c..36b761b5490a 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -73,6 +73,7 @@
#include <algorithm>
#include <memory>
#include <string_view>
+#include <utility>
#include <vector>
#include "dp_extbackenddb.hxx"
@@ -253,7 +254,7 @@ class XPackage_eq
{
OUString m_URL;
public:
- explicit XPackage_eq(const OUString & s) : m_URL(s) {}
+ explicit XPackage_eq(OUString s) : m_URL(std::move(s)) {}
bool operator() (const Reference<deployment::XPackage> & p) const
{
return m_URL == p->getURL();
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 4d3501bf7152..b617d7fa4ed1 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <utility>
using namespace ::dp_misc;
@@ -71,7 +72,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
public:
PackageImpl(
::rtl::Reference<BackendImpl> const & myBackend,
- OUString const & url, OUString const & libType, bool bRemoved,
+ OUString const & url, OUString libType, bool bRemoved,
OUString const & identifier);
// XPackage
virtual OUString SAL_CALL getDescription() override;
@@ -135,11 +136,11 @@ OUString BackendImpl::PackageImpl::getLicenseText()
BackendImpl::PackageImpl::PackageImpl(
::rtl::Reference<BackendImpl> const & myBackend,
- OUString const & url, OUString const & libType, bool bRemoved,
+ OUString const & url, OUString libType, bool bRemoved,
OUString const & identifier)
: Package( myBackend, url, OUString(), OUString(),
myBackend->m_xTypeInfo, bRemoved, identifier),
- m_descr(libType)
+ m_descr(std::move(libType))
{
initPackageHandler();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c833bc817c0d..5dbf4be8f2b3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -40,6 +40,7 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <sal/log.hxx>
+#include <utility>
#include <vcl/errinf.hxx>
#include <vcl/lok.hxx>
#include <o3tl/any.hxx>
@@ -1201,8 +1202,8 @@ vcl::Font FindFont_FallbackToDefault(std::u16string_view
rFontName)
}
} // anonymous namespace
-LibLODocument_Impl::LibLODocument_Impl(const uno::Reference
<css::lang::XComponent> &xComponent, int nDocumentId)
- : mxComponent(xComponent)
+LibLODocument_Impl::LibLODocument_Impl(uno::Reference <css::lang::XComponent>
xComponent, int nDocumentId)
+ : mxComponent(std::move(xComponent))
, mnDocumentId(nDocumentId)
{
assert(nDocumentId != -1 && "Cannot set mnDocumentId to -1");
@@ -4032,9 +4033,9 @@ class DispatchResultListener : public
cppu::WeakImplHelper<css::frame::XDispatch
std::shared_ptr<CallbackFlushHandler> mpCallback; ///< Callback to call.
public:
- DispatchResultListener(const char* pCommand,
std::shared_ptr<CallbackFlushHandler> const & pCallback)
+ DispatchResultListener(const char* pCommand,
std::shared_ptr<CallbackFlushHandler> pCallback)
: maCommand(pCommand)
- , mpCallback(pCallback)
+ , mpCallback(std::move(pCallback))
{
assert(mpCallback);
}
diff --git a/desktop/source/lib/lokinteractionhandler.cxx
b/desktop/source/lib/lokinteractionhandler.cxx
index 6b94ee907318..09ee2aaa9f90 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -45,6 +45,7 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <sfx2/lokhelper.hxx>
#include <sfx2/viewsh.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <tools/json_writer.hxx>
@@ -52,12 +53,12 @@
using namespace com::sun::star;
LOKInteractionHandler::LOKInteractionHandler(
- const OString& rCommand,
+ OString command,
desktop::LibLibreOffice_Impl *const pLOKit,
desktop::LibLODocument_Impl *const pLOKDocument)
: m_pLOKit(pLOKit)
, m_pLOKDocument(pLOKDocument)
- , m_command(rCommand)
+ , m_command(std::move(command))
, m_usePassword(false)
{
assert(m_pLOKit);
diff --git a/desktop/source/lib/lokinteractionhandler.hxx
b/desktop/source/lib/lokinteractionhandler.hxx
index 108343ec22e3..61524a6c1c07 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -82,7 +82,7 @@ public:
void SetPassword(char const* pPassword);
explicit LOKInteractionHandler(
- const OString& rCommand,
+ OString command,
desktop::LibLibreOffice_Impl *,
desktop::LibLODocument_Impl *pLOKDocumt = nullptr);
diff --git a/desktop/source/migration/migration_impl.hxx
b/desktop/source/migration/migration_impl.hxx
index d06657588e07..6b0923d292da 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -21,6 +21,7 @@
#include <memory>
#include <string_view>
#include <unordered_map>
+#include <utility>
#include <vector>
#include <o3tl/string_view.hxx>
@@ -86,12 +87,12 @@ struct MigrationItem
{
}
- MigrationItem(const OUString& sParentNodeName,
- const OUString& sPrevSibling,
- const OUString& sCommandURL,
- const css::uno::Reference< css::container::XIndexContainer > &
xPopupMenu)
- : m_sParentNodeName(sParentNodeName), m_sPrevSibling(sPrevSibling),
- m_sCommandURL(sCommandURL), m_xPopupMenu(xPopupMenu)
+ MigrationItem(OUString sParentNodeName,
+ OUString sPrevSibling,
+ OUString sCommandURL,
+ css::uno::Reference< css::container::XIndexContainer > xPopupMenu)
+ : m_sParentNodeName(std::move(sParentNodeName)),
m_sPrevSibling(std::move(sPrevSibling)),
+ m_sCommandURL(std::move(sCommandURL)),
m_xPopupMenu(std::move(xPopupMenu))
{
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 374520235a0a..a12ee6ae4117 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -48,6 +48,7 @@
#if defined(UNX)
#include <unistd.h>
#endif
+#include <utility>
#include <vector>
@@ -61,7 +62,7 @@ namespace {
struct ExtensionName
{
OUString m_str;
- explicit ExtensionName( OUString const & str ) : m_str( str ) {}
+ explicit ExtensionName( OUString str ) : m_str(std::move( str )) {}
bool operator () ( Reference<deployment::XPackage> const & e ) const
{
return m_str == dp_misc::getIdentifier(e)
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h
b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 9db42e908619..21d0f6a92856 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -23,6 +23,7 @@
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
+#include <utility>
#include <vector>
#define APP_NAME "unopkg"
@@ -39,8 +40,8 @@ struct OptionInfo
struct LockFileException
{
- explicit LockFileException(OUString const & sMessage) :
- Message(sMessage) {}
+ explicit LockFileException(OUString sMessage) :
+ Message(std::move(sMessage)) {}
OUString Message;
};
