diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-13 21:12:38 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-15 16:28:14 +0100 |
commit | 12a8fa0d656f3f8bad7c9f85e4f760b5201d5f75 (patch) | |
tree | 51bf0e790789a218b8c788ab22258180cca77e40 | |
parent | c42cf09f17e683d7487b8b298bd2f5ff3587bf00 (diff) |
Revert "loplugin:constfields in ucbhelper"
This reverts commit 64035391ebe8810520a214a3ae0aeb4c1b039819.
Change-Id: Icfde3e984f9ebf93a423d101aee385182f65dea5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90518
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | UnoControls/source/inc/OConnectionPointHelper.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 18 | ||||
-rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/client/proxydecider.cxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 3de932caa765..9cd5a7907396 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -98,7 +98,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 const m_aInterfaceType; + css::uno::Type m_aInterfaceType; css::uno::Reference< css::uno::XInterface > m_xLock; }; diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index b7f40c8f176f..facd9342363a 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -292,21 +292,21 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final : public css::lang::XTypeProvider, public css::ucb::XInteractionSupplyAuthentication2 { - css::uno::Sequence< css::ucb::RememberAuthentication > const + css::uno::Sequence< css::ucb::RememberAuthentication > m_aRememberPasswordModes; - css::uno::Sequence< css::ucb::RememberAuthentication > const + css::uno::Sequence< css::ucb::RememberAuthentication > m_aRememberAccountModes; OUString m_aRealm; OUString m_aUserName; OUString m_aPassword; css::ucb::RememberAuthentication m_eRememberPasswordMode; - 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; + 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; bool m_bUseSystemCredentials : 1; public: diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index b297ebcebc82..eed2ef6355ac 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -61,7 +61,7 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : protected: osl::Mutex m_aMutex; - css::ucb::OpenCommandArgument2 const m_aCommand; + css::ucb::OpenCommandArgument2 m_aCommand; css::uno::Reference< css::uno::XComponentContext > m_xContext; // Resultset #1 css::uno::Reference< css::sdbc::XResultSet > m_xResultSet1; diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 062dd64b2887..a8ffd9599f34 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -68,7 +68,7 @@ namespace { class WildCard { private: - OString const m_aWildString; + OString m_aWildString; public: explicit WildCard( const OUString& rWildCard ) diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 468bf2392a80..6cb1536675b8 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -43,8 +43,8 @@ namespace { struct PropertyInfo { const char* pName; - sal_Int32 const nHandle; - sal_Int16 const nAttributes; + sal_Int32 nHandle; + sal_Int16 nAttributes; const uno::Type& (*pGetCppuType)(); }; @@ -152,7 +152,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 > const m_aProperties; + uno::Sequence< beans::Property > m_aProperties; rtl::Reference< ResultSetDataSupplier > m_xDataSupplier; osl::Mutex m_aMutex; std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners; |