loplugin:constfields in ucbhelper

Change-Id: Ic9d59b352dcb771191de963c0f6e90c74647c8b8
Reviewed-on: https://gerrit.libreoffice.org/60983
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 22 insertions, 33 deletions

diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index cf87833b29ca..51143fc4c681 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -100,7 +100,7 @@ private:
     css::uno::WeakReference< css::lang::XConnectionPointContainer >   m_oContainerWeakReference;   // Reference to container-class!. Don't use Reference<...>
                                                                                             // It is a ring-reference => and must be a wekreference!
     OConnectionPointContainerHelper*                                  m_pContainerImplementation;
-    css::uno::Type                                                    m_aInterfaceType;
+    css::uno::Type const                                                    m_aInterfaceType;
     css::uno::Reference< css::uno::XInterface >                       m_xLock;
 };
 
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 4ee4e93715f8..74df7f1f6c87 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -307,22 +307,22 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
                   public css::lang::XTypeProvider,
                   public css::ucb::XInteractionSupplyAuthentication2
 {
-    css::uno::Sequence< css::ucb::RememberAuthentication >
+    css::uno::Sequence< css::ucb::RememberAuthentication > const
                   m_aRememberPasswordModes;
-    css::uno::Sequence< css::ucb::RememberAuthentication >
+    css::uno::Sequence< css::ucb::RememberAuthentication > const
                   m_aRememberAccountModes;
     OUString m_aRealm;
     OUString m_aUserName;
     OUString m_aPassword;
     OUString m_aAccount;
     css::ucb::RememberAuthentication m_eRememberPasswordMode;
-    css::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
-    css::ucb::RememberAuthentication m_eDefaultRememberAccountMode;
-    bool m_bCanSetRealm    : 1;
-    bool m_bCanSetUserName : 1;
-    bool m_bCanSetPassword : 1;
-    bool m_bCanSetAccount  : 1;
-    bool m_bCanUseSystemCredentials     : 1;
+    css::ucb::RememberAuthentication const m_eDefaultRememberPasswordMode;
+    css::ucb::RememberAuthentication const m_eDefaultRememberAccountMode;
+    bool const m_bCanSetRealm    : 1;
+    bool const m_bCanSetUserName : 1;
+    bool const m_bCanSetPassword : 1;
+    bool const m_bCanSetAccount  : 1;
+    bool const m_bCanUseSystemCredentials     : 1;
     bool m_bUseSystemCredentials        : 1;
 
 public:
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 7c9452b8407b..15c74b4235c1 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -62,7 +62,7 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
 
 protected:
     osl::Mutex                                                 m_aMutex;
-    css::ucb::OpenCommandArgument2                             m_aCommand;
+    css::ucb::OpenCommandArgument2 const                       m_aCommand;
     css::uno::Reference< css::uno::XComponentContext >         m_xContext;
     // Resultset #1
     css::uno::Reference< css::sdbc::XResultSet >               m_xResultSet1;
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 2e410a88a83a..3a11d8f99468 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -52,9 +52,6 @@ struct ResultSetColumnData
     /** @see ResultSetMetaData::isCaseSensitive */
     bool        isCaseSensitive;
 
-    /** @see ResultSetMetaData::getColumnDisplaySize */
-    sal_Int32       columnDisplaySize;
-
     inline ResultSetColumnData();
 };
 
@@ -62,8 +59,7 @@ struct ResultSetColumnData
 //       may heavily depend on the behaviour of the default constructor.
 
 ResultSetColumnData::ResultSetColumnData()
-: isCaseSensitive( true ),
-  columnDisplaySize( 16 )
+: isCaseSensitive( true )
 {
 }
 
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 0f5bd69553b7..31e26055ffcf 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -66,7 +66,7 @@ namespace proxydecider_impl
 class WildCard
 {
 private:
-    OString m_aWildString;
+    OString const m_aWildString;
 
 public:
     explicit WildCard( const OUString& rWildCard )
@@ -80,18 +80,13 @@ public:
 
 typedef std::pair< WildCard, WildCard > NoProxyListEntry;
 
-
 class HostnameCache
 {
     typedef std::pair< OUString, OUString > HostListEntry;
 
     std::deque< HostListEntry >    m_aHostList;
-    sal_uInt32                     m_nCapacity;
 
 public:
-    explicit HostnameCache()
-        : m_nCapacity( 256 ) {}
-
     bool get( const OUString & rKey, OUString & rValue ) const
     {
         for (auto const& host : m_aHostList)
@@ -107,8 +102,10 @@ public:
 
     void put( const OUString & rKey, const OUString & rValue )
     {
-        if ( m_aHostList.size() == m_nCapacity )
-            m_aHostList.resize( m_nCapacity / 2 );
+        static constexpr sal_uInt32 nCapacity = 256;
+
+        if ( m_aHostList.size() == nCapacity )
+            m_aHostList.resize( nCapacity / 2 );
 
         m_aHostList.push_front( HostListEntry( rKey, rValue ) );
     }
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index c482332909c4..4ed85d478550 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -42,8 +42,8 @@ namespace ucbhelper_impl
 struct PropertyInfo
 {
     const char* pName;
-    sal_Int32   nHandle;
-    sal_Int16   nAttributes;
+    sal_Int32 const   nHandle;
+    sal_Int16 const   nAttributes;
     const uno::Type& (*pGetCppuType)();
 };
 
@@ -143,7 +143,7 @@ struct ResultSet_Impl
     uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
     uno::Reference< beans::XPropertySetInfo >       m_xPropSetInfo;
     uno::Reference< sdbc::XResultSetMetaData >      m_xMetaData;
-    uno::Sequence< beans::Property >                m_aProperties;
+    uno::Sequence< beans::Property > const          m_aProperties;
     rtl::Reference< ResultSetDataSupplier >         m_xDataSupplier;
     osl::Mutex                          m_aMutex;
     std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners;
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 4f99af2cae39..3666fa802f9b 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -198,16 +198,12 @@ sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 /*column*/ )
 
 
 // virtual
-sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
+sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 /*column*/ )
 {
     /*
         Gets the normal maximum width in characters for column.
      */
-
-    if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
-        return 16;
-
-    return m_pImpl->m_aColumnData[ column - 1 ].columnDisplaySize;
+    return 16;
 }