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>

12 files changed, 23 insertions, 23 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
 {
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 6a11fdeae059..aebf71fc26d1 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -160,7 +160,7 @@ bool readArgument(
 namespace {
 struct ExecutableDir : public rtl::StaticWithInit<
     OUString, ExecutableDir> {
-    const OUString operator () () {
+    OUString operator () () {
         OUString path;
         if (osl_getExecutableFile( &path.pData ) != osl_Process_E_None) {
             throw RuntimeException("cannot locate executable directory!",nullptr);
@@ -170,7 +170,7 @@ struct ExecutableDir : public rtl::StaticWithInit<
 };
 struct ProcessWorkingDir : public rtl::StaticWithInit<
     OUString, ProcessWorkingDir> {
-    const OUString operator () () {
+    OUString operator () () {
         OUString workingDir;
         utl::Bootstrap::getProcessWorkingDir(workingDir);
         return workingDir;
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index d184032ae684..b72c026bc6fe 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -753,7 +753,7 @@ namespace emfplushelper
     {
     }
 
-    ::basegfx::B2DPolyPolygon const EmfPlusHelperData::combineClip(::basegfx::B2DPolyPolygon const & leftPolygon, int combineMode, ::basegfx::B2DPolyPolygon const & rightPolygon)
+    ::basegfx::B2DPolyPolygon EmfPlusHelperData::combineClip(::basegfx::B2DPolyPolygon const & leftPolygon, int combineMode, ::basegfx::B2DPolyPolygon const & rightPolygon)
     {
         basegfx::B2DPolyPolygon aClippedPolyPolygon;
         switch (combineMode)
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx
index 7499544b6330..98a6deafa374 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -206,7 +206,7 @@ namespace emfplushelper
         // readers
         static void ReadRectangle(SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false);
         static bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget);
-        static ::basegfx::B2DPolyPolygon const combineClip(::basegfx::B2DPolyPolygon const & leftPolygon, int combineMode, ::basegfx::B2DPolyPolygon const & rightPolygon);
+        static ::basegfx::B2DPolyPolygon combineClip(::basegfx::B2DPolyPolygon const & leftPolygon, int combineMode, ::basegfx::B2DPolyPolygon const & rightPolygon);
 
         static float getUnitToPixelMultiplier(const UnitType aUnitType);
     };
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index e2fdcbf1caee..91a81b428c6f 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -161,7 +161,7 @@ namespace XSLT
         }
     }
 
-    const OString
+    OString
     OleHandler::getByName(const OUString& streamName)
     {
         if ( streamName == "oledata.mso" )
diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx
index 4a1871f229c1..bf7e945b8ecb 100644
--- a/filter/source/xsltfilter/OleHandler.hxx
+++ b/filter/source/xsltfilter/OleHandler.hxx
@@ -67,8 +67,8 @@ namespace XSLT
             if (m_tcontext)
                 m_tcontext->_private = nullptr;
         }
-        void          insertByName(const OUString& streamName, const OString& content);
-        const OString getByName(const OUString& streamName);
+        void    insertByName(const OUString& streamName, const OString& content);
+        OString getByName(const OUString& streamName);
         void registercontext(xsltTransformContextPtr context)
         {
             assert(context);
diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx
index 82dab2fbf547..0a9e43491508 100644
--- a/forms/source/xforms/pathexpression.cxx
+++ b/forms/source/xforms/pathexpression.cxx
@@ -69,7 +69,7 @@ void PathExpression::setExpression( const OUString& rExpression )
     maNodes.clear();
 }
 
-const OUString PathExpression::_getExpressionForEvaluation() const
+OUString PathExpression::_getExpressionForEvaluation() const
 {
     OUString sExpr = ComputedExpression::_getExpressionForEvaluation();
     if( sExpr.isEmpty())
diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx
index 44d9630df4ac..2d1743837198 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -49,7 +49,7 @@ private:
     NodeVector_t maNodes;
 
     /// get expression for evaluation
-    const OUString _getExpressionForEvaluation() const;
+    OUString _getExpressionForEvaluation() const;
 
 
 public: