[Libreoffice-commits] core.git: xmlhelp/source

[Noel Grandin (via logerrit)]

 xmlhelp/source/cxxhelp/inc/tvread.hxx             |    2 +-
 xmlhelp/source/cxxhelp/provider/content.cxx       |   10 +++++-----
 xmlhelp/source/cxxhelp/provider/databases.hxx     |   12 ++++++------
 xmlhelp/source/cxxhelp/provider/db.hxx            |    2 +-
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |    2 +-
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx  |    2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 073817736f359821b668921cfad20c96943486bd
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 16 09:24:00 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 16 10:29:56 2020 +0100

    Revert "loplugin:constfields in xmlhelp"
    
    This reverts commit 04e9a4c012f12dc26fda10aabb8d229555c711ab.
    
    Change-Id: I2d1b44c84197d88bc58adf0280c8e1fd84795293
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90546
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 4753b9859930..fe529d3bfcfa 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -265,7 +265,7 @@ namespace treeview {
         css::uno::Reference< css::ucb::XSimpleFileAccess3 >   m_xSFA;
 
         IteratorState                                                               m_eState;
-        OUString const                                                              m_aLanguage;
+        OUString                                                               m_aLanguage;
 
         css::uno::Sequence< css::uno::Reference
             < css::deployment::XPackage > >                              m_aUserPackagesSeq;
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 88ebe87bfece..4ad2c3fa78c8 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -134,9 +134,9 @@ private:
 
     uno::Reference< uno::XComponentContext >     m_xContext;
     uno::Reference< ucb::XContentProvider >      m_xProvider;
-    uno::Sequence< beans::Property > const       m_seq;
-    URLParameter const                           m_aURLParameter;
-    Databases* const                             m_pDatabases;
+    uno::Sequence< beans::Property >             m_seq;
+    URLParameter                                 m_aURLParameter;
+    Databases*                                   m_pDatabases;
 
 public:
 
@@ -171,9 +171,9 @@ private:
 
     uno::Reference< uno::XComponentContext >     m_xContext;
     uno::Reference< ucb::XContentProvider >      m_xProvider;
-    uno::Sequence< beans::Property > const       m_seq;
+    uno::Sequence< beans::Property >             m_seq;
     URLParameter                                 m_aURLParameter;
-    Databases* const                             m_pDatabases;
+    Databases*                                   m_pDatabases;
 
 public:
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 3577b39d975f..6edf6a0ce78d 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -54,10 +54,10 @@ namespace chelp {
     {
     private:
 
-        OUString const m_aStartId;
-        OUString const m_aProgramSwitch;
-        OUString const m_aTitle;
-        int const m_nOrder;
+        OUString m_aStartId;
+        OUString m_aProgramSwitch;
+        OUString m_aTitle;
+        int m_nOrder;
 
     public:
 
@@ -223,7 +223,7 @@ namespace chelp {
         css::uno::Reference< css::lang::XMultiComponentFactory > m_xSMgr;
         css::uno::Reference< css::ucb::XSimpleFileAccess3 >      m_xSFA;
 
-        bool const   m_bShowBasic;
+        bool   m_bShowBasic;
 
         std::vector<char> m_vCustomCSSDoc;
         OUString m_aCSS;
@@ -377,7 +377,7 @@ namespace chelp {
             const css::uno::Reference< css::deployment::XPackage >& xPackage,
             OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath );
 
-        bool const                                                                        m_bHelpText;
+        bool                                                                        m_bHelpText;
 
     }; // end class DataBaseIterator
 
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index ce7dbc29d15d..607b987ff838 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -51,7 +51,7 @@ namespace helpdatafileproxy {
 
     class Hdf
     {
-        OUString const       m_aFileURL;
+        OUString       m_aFileURL;
         std::unique_ptr<StringToDataMap>   m_pStringToDataMap;
         std::unique_ptr<StringToValPosMap> m_pStringToValPosMap;
         css::uno::Reference< css::ucb::XSimpleFileAccess3 >
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 50cd31e971c1..53a79d035a55 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -386,7 +386,7 @@ namespace chelp {
         ItemSet                             m_aItems;
         std::vector<OUString>               m_aPath;
 
-        css::uno::Sequence< css::beans::Property > const          m_sProperty;
+        css::uno::Sequence< css::beans::Property >           m_sProperty;
 
         osl::Mutex                          m_aMutex;
         std::unique_ptr<comphelper::OInterfaceContainerHelper2>   m_pDisposeEventListeners;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 11269c4d04a2..d81aafcbc348 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -168,7 +168,7 @@ namespace chelp {
         bool m_bHelpDataFileRead;
         bool m_bUseDB;
 
-        OUString const m_aURL;
+        OUString  m_aURL;
 
         OUString  m_aTag;
         OUString  m_aId;