summaryrefslogtreecommitdiff
path: root/desktop/source/deployment
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-24 14:40:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-08-24 18:14:37 +0200
commitd48d9c0f96870780be35cf98b7915fdbb4db6735 (patch)
treea781783dedcbf9fac04338a44f3720a6bd60875e /desktop/source/deployment
parentc7799d71899c121334855c3234a9492687803b59 (diff)
loplugin:returnconstval in desktop..forms
Change-Id: I268e352e4e3054d1c1a8e61e52d91fd99794b359 Reviewed-on: https://gerrit.libreoffice.org/78057 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop/source/deployment')
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx6
-rw-r--r--desktop/source/deployment/misc/dp_platform.cxx6
-rw-r--r--desktop/source/deployment/misc/dp_resource.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx12
5 files changed, 14 insertions, 14 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 765f0939845d..f73d1ffe2a28 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -94,7 +94,7 @@ namespace dp_gui {
struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
{
- const OUString operator () () {
+ OUString operator () () {
const SolarMutexGuard guard;
std::locale loc = Translate::Create("fps");
return Translate::get(STR_FILTERNAME_ALL, loc);
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 568ab79d4ec1..a23855109c36 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -75,7 +75,7 @@ namespace {
struct UnoRc : public rtl::StaticWithInit<
std::shared_ptr<rtl::Bootstrap>, UnoRc> {
- const std::shared_ptr<rtl::Bootstrap> operator () () {
+ std::shared_ptr<rtl::Bootstrap> operator () () {
OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("louno") );
::rtl::Bootstrap::expandMacros( unorc );
std::shared_ptr< ::rtl::Bootstrap > ret(
@@ -86,10 +86,10 @@ struct UnoRc : public rtl::StaticWithInit<
};
struct OfficePipeId : public rtl::StaticWithInit<OUString, OfficePipeId> {
- const OUString operator () ();
+ OUString operator () ();
};
-const OUString OfficePipeId::operator () ()
+OUString OfficePipeId::operator () ()
{
OUString userPath;
::utl::Bootstrap::PathStatus aLocateResult =
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 74d80e9f1e9e..18ad1a8adc38 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -35,7 +35,7 @@ namespace
{
struct StrOperatingSystem :
public rtl::StaticWithInit<OUString, StrOperatingSystem> {
- const OUString operator () () {
+ OUString operator () () {
OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros( os );
return os;
@@ -44,7 +44,7 @@ namespace
struct StrCPU :
public rtl::StaticWithInit<OUString, StrCPU> {
- const OUString operator () () {
+ OUString operator () () {
OUString arch( "$_ARCH" );
::rtl::Bootstrap::expandMacros( arch );
return arch;
@@ -54,7 +54,7 @@ namespace
struct StrPlatform : public rtl::StaticWithInit<
OUString, StrPlatform> {
- const OUString operator () () {
+ OUString operator () () {
OUStringBuffer buf;
buf.append( StrOperatingSystem::get() );
buf.append( '_' );
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index c6e9d2a18e3a..a6b3285b3850 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -36,7 +36,7 @@ namespace {
struct OfficeLocale :
public rtl::StaticWithInit<LanguageTag, OfficeLocale> {
- const LanguageTag operator () () {
+ LanguageTag operator () () {
OUString slang(utl::ConfigManager::getUILocale());
//fallback, the locale is currently only set when the user starts the
//office for the first time.
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 98ff6a52a888..42de7f9dd042 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -140,7 +140,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
::rtl::Reference<AbortChannel> const & abortChannel,
Reference<XCommandEnvironment> const & xCmdEnv ) override;
- const Reference<registry::XSimpleRegistry> getRDB() const;
+ Reference<registry::XSimpleRegistry> getRDB() const;
public:
ComponentPackageImpl(
@@ -220,8 +220,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
private:
BackendImpl * getMyBackend() const;
- const Reference<registry::XSimpleRegistry> impl_openRDB() const;
- const Reference<XInterface> impl_createInstance(OUString const& rService) const;
+ Reference<registry::XSimpleRegistry> impl_openRDB() const;
+ Reference<XInterface> impl_createInstance(OUString const& rService) const;
// Package
virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_(
@@ -342,7 +342,7 @@ BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
m_registered( REG_UNINIT )
{}
-const Reference<registry::XSimpleRegistry>
+Reference<registry::XSimpleRegistry>
BackendImpl::ComponentPackageImpl::getRDB() const
{
BackendImpl * that = getMyBackend();
@@ -1534,7 +1534,7 @@ BackendImpl::OtherPlatformPackageImpl::getMyBackend() const
return pBackend;
}
-Reference<registry::XSimpleRegistry> const
+Reference<registry::XSimpleRegistry>
BackendImpl::OtherPlatformPackageImpl::impl_openRDB() const
{
OUString const aRDB(m_aPlatform + ".rdb");
@@ -1561,7 +1561,7 @@ BackendImpl::OtherPlatformPackageImpl::impl_openRDB() const
return xRegistry;
}
-Reference<XInterface> const
+Reference<XInterface>
BackendImpl::OtherPlatformPackageImpl::impl_createInstance(OUString const& rService)
const
{