11 files changed, 12 insertions, 12 deletions
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 22cd5c45ccf5..137fd1d56ad1 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -57,7 +57,7 @@ public:
 
     const OUString&     GetName() const     { return m_aName; }
     const OUString&     GetType() const     { return m_aType; }
-    const OUString      GetExtension() const    { return m_aType.getLength() > 2 ? m_aType.copy( 2 ) : OUString(); }
+    OUString            GetExtension() const    { return m_aType.getLength() > 2 ? m_aType.copy( 2 ) : OUString(); }
 
     bool            isGroupSeparator() const    { return m_aType.isEmpty(); }
 };
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 564c1de137c6..17f2ef77a1d3 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -278,7 +278,7 @@ GtkToolItem* gtv_application_window_find_tool_by_unocommand(GtvApplicationWindow
     return result;
 }
 
-static const std::string
+static std::string
 createRenderingArgsJSON(const GtvRenderingArgs* pRenderingArgs)
 {
     boost::property_tree::ptree aTree;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
index 2a4784da5209..63f232b6021f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@@ -139,7 +139,7 @@ GtkWidget* GtvHelpers::createCommentBox(const boost::property_tree::ptree& aComm
     return pCommentVBox;
 }
 
-const std::string GtvHelpers::getDirPath(const std::string& filePath)
+std::string GtvHelpers::getDirPath(const std::string& filePath)
 {
     int position = filePath.find_last_of('/');
     const std::string dirPath = filePath.substr(0, position + 1);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
index 9474f4c0271a..cc686bfdfdd4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
@@ -37,10 +37,10 @@ namespace GtvHelpers
 
     GtkWidget* createCommentBox(const boost::property_tree::ptree& aComment);
 
-    const std::string getDirPath(const std::string& filePath);
+    std::string getDirPath(const std::string& filePath);
 
     template<typename T>
-    const std::vector<T> split(const std::string& aPayload, const std::string& aDelim, const int nItems)
+    std::vector<T> split(const std::string& aPayload, const std::string& aDelim, const int nItems)
     {
         std::vector<T> aRet;
 
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index a415a8448e6c..4541a0c3706f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -250,7 +250,7 @@ gtv_main_toolbar_add_recent_uno(GtvMainToolbar* toolbar, const std::string& rUno
     // TODO: Remove other text entries with same key
 }
 
-const std::string
+std::string
 gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const std::string& rUnoCmd)
 {
     GtvMainToolbarPrivate& priv = getPrivate(toolbar);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
index 2e43ed4c7dc7..0930228fda59 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
@@ -53,7 +53,7 @@ void gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar, LibreOfficeKitDocument
 
 void gtv_main_toolbar_add_recent_uno(GtvMainToolbar* toolbar, const std::string& rUnoCmdStr);
 
-const std::string gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const std::string& rUnoCmd);
+std::string gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const std::string& rUnoCmd);
 
 #endif /* GTV_MAIN_TOOLBAR_H */
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 60ec5afbc8c5..51e1e8e1e801 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1010,7 +1010,7 @@ payloadToRectangle (LOKDocView* pDocView, const char* pPayload)
     return aRet;
 }
 
-static const std::vector<GdkRectangle>
+static std::vector<GdkRectangle>
 payloadToRectangles(LOKDocView* pDocView, const char* pPayload)
 {
     std::vector<GdkRectangle> aRet;
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 55b1f40b5dd0..f7320100dc3b 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -57,7 +57,7 @@ using namespace linguistic;
 #define CONV_TYPE_SCHINESE_TCHINESE     "Chinese simplified / Chinese traditional"
 
 
-static const OUString ConversionTypeToText( sal_Int16 nConversionType )
+static OUString ConversionTypeToText( sal_Int16 nConversionType )
 {
     OUString aRes;
     if (nConversionType == ConversionDictionaryType::HANGUL_HANJA)
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 1cb3ba7836f5..ff76226896f5 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -130,7 +130,7 @@ public:
     rtl::Reference<comphelper::RefCountedMutex>& GetSharedMutexRef() { return m_aMutexHolder; }
 
     void ConnectTo( const css::uno::Reference< css::io::XInputStream >& xInStream );
-    const css::uno::Sequence< sal_Int8 > GetEncryptionKey();
+    css::uno::Sequence< sal_Int8 > GetEncryptionKey();
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 4ade3f66119c..a7bb9e818e10 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1624,7 +1624,7 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc
                                     makeAny ( aException ) );
 }
 
-const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
+uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
 {
     uno::Sequence< sal_Int8 > aResult;
 
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 29f121965569..56de5307d262 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -227,7 +227,7 @@ namespace
         return lcl_getReportControlFont( _rxReportControlFormat, aAwtFont, _nWhich );
     }
 
-    const vcl::Font lcl_setFont(const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
+    vcl::Font lcl_setFont(const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
         SfxItemSet& _rItemSet,sal_uInt16 _nWhich,sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nLanguage,sal_uInt16 _nPosture, sal_uInt16 _nWeight)
     {
         // fill it