diff options
Diffstat (limited to 'include/comphelper')
-rw-r--r-- | include/comphelper/ChainablePropertySet.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/MasterPropertySet.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/PropertyInfoHash.hxx | 10 | ||||
-rw-r--r-- | include/comphelper/asyncnotification.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/componentmodule.hxx | 8 | ||||
-rw-r--r-- | include/comphelper/enumhelper.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/flagguard.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/interaction.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/interfacecontainer2.hxx | 6 | ||||
-rw-r--r-- | include/comphelper/profilezone.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/propmultiplex.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/seqstream.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/stl_types.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/string.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/threadpool.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/unique_disposing_ptr.hxx | 2 |
16 files changed, 27 insertions, 27 deletions
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index a306850caf18..e048883ada7c 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -68,7 +68,7 @@ namespace comphelper { friend class MasterPropertySet; protected: - SolarMutex* mpMutex; + SolarMutex* const mpMutex; rtl::Reference < ChainablePropertySetInfo > mxInfo; /// @throws css::beans::UnknownPropertyException diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index 4fe94ac90267..4a78c5ee7638 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -60,7 +60,7 @@ namespace comphelper public css::beans::XMultiPropertySet { protected: - SolarMutex* mpMutex; + SolarMutex* const mpMutex; sal_uInt8 mnLastId; std::map< sal_uInt8, comphelper::SlaveData* > maSlaveMap; rtl::Reference< MasterPropertySetInfo > mxInfo; diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx index 1e1374f317dc..3f1e4e084c97 100644 --- a/include/comphelper/PropertyInfoHash.hxx +++ b/include/comphelper/PropertyInfoHash.hxx @@ -28,14 +28,14 @@ namespace comphelper { struct PropertyInfo { - OUString maName; - sal_Int32 mnHandle; - css::uno::Type maType; - sal_Int16 mnAttributes; + OUString const maName; + sal_Int32 const mnHandle; + css::uno::Type const maType; + sal_Int16 const mnAttributes; }; struct PropertyData { - sal_uInt8 mnMapId; + sal_uInt8 const mnMapId; PropertyInfo const *mpInfo; PropertyData ( sal_uInt8 nMapId, PropertyInfo const *pInfo ) : mnMapId ( nMapId ) diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index b08e3be3fc48..bc2ebf54f675 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -204,7 +204,7 @@ namespace comphelper typedef EVENT_OBJECT EventObjectType; private: - EventObjectType m_aEvent; + EventObjectType const m_aEvent; public: EventHolder( const EventObjectType& _rEvent ) diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index bc0292a667ca..1793953aaf49 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -53,13 +53,13 @@ namespace comphelper struct COMPHELPER_DLLPUBLIC ComponentDescription { /// the implementation name of the component - OUString sImplementationName; + OUString const sImplementationName; /// the services supported by the component implementation - css::uno::Sequence< OUString > aSupportedServices; + css::uno::Sequence< OUString > const aSupportedServices; /// the function to create an instance of the component - ::cppu::ComponentFactoryFunc pComponentCreationFunc; + ::cppu::ComponentFactoryFunc const pComponentCreationFunc; /// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>) - FactoryInstantiation pFactoryCreationFunc; + FactoryInstantiation const pFactoryCreationFunc; ComponentDescription( const OUString& _rImplementationName, diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx index 67b21df92b0f..2de51f332782 100644 --- a/include/comphelper/enumhelper.hxx +++ b/include/comphelper/enumhelper.hxx @@ -45,7 +45,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock , public ::cppu::WeakImplHelper< css::container::XEnumeration , css::lang::XEventListener > { - css::uno::Sequence< OUString > m_aNames; + css::uno::Sequence< OUString > const m_aNames; sal_Int32 m_nPos; css::uno::Reference< css::container::XNameAccess > m_xAccess; bool m_bListening; diff --git a/include/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx index 96e721e7aa79..17c78ec5ddc6 100644 --- a/include/comphelper/flagguard.hxx +++ b/include/comphelper/flagguard.hxx @@ -45,7 +45,7 @@ namespace comphelper struct RestoreFlag { bool & rFlag; - bool originalValue; + bool const originalValue; RestoreFlag(bool & i_flagRef) : rFlag(i_flagRef), originalValue(i_flagRef) {} void operator()() diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index 84c0b528067e..ec9f38e29436 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -112,7 +112,7 @@ namespace comphelper */ class COMPHELPER_DLLPUBLIC OInteractionRequest : public OInteractionRequest_Base { - css::uno::Any + css::uno::Any const m_aRequest; /// the request we represent std::vector< css::uno::Reference< css::task::XInteractionContinuation > > m_aContinuations; /// all registered continuations diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx index 269da31a6666..f0f79c3033df 100644 --- a/include/comphelper/interfacecontainer2.hxx +++ b/include/comphelper/interfacecontainer2.hxx @@ -105,7 +105,7 @@ public: private: OInterfaceContainerHelper2 & rCont; - bool bIsList; + bool const bIsList; detail::element_alias2 aData; sal_Int32 nRemain; @@ -262,8 +262,8 @@ private: { private: typedef void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& ); - NotificationMethod m_pMethod; - const EventT& m_rEvent; + NotificationMethod const m_pMethod; + const EventT& m_rEvent; public: NotifySingleListener( NotificationMethod method, const EventT& event ) : m_pMethod( method ), m_rEvent( event ) { } diff --git a/include/comphelper/profilezone.hxx b/include/comphelper/profilezone.hxx index 764601682f05..09b140748c33 100644 --- a/include/comphelper/profilezone.hxx +++ b/include/comphelper/profilezone.hxx @@ -36,7 +36,7 @@ class COMPHELPER_DLLPUBLIC ProfileZone { private: const char * m_sProfileId; - long long m_aCreateTime; + long long const m_aCreateTime; public: // Note that the char pointer is stored as such in the ProfileZone object and used in the diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index baa5103d5bd8..4407e39528ad 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -82,7 +82,7 @@ namespace comphelper OPropertyChangeListener* m_pListener; sal_Int32 m_nLockCount; bool m_bListening : 1; - bool m_bAutoSetRelease : 1; + bool const m_bAutoSetRelease : 1; virtual ~OPropertyChangeMultiplexer() override; diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 998c4a099d93..656b2a25899e 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -39,7 +39,7 @@ class COMPHELPER_DLLPUBLIC SequenceInputStream : public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable > { ::osl::Mutex m_aMutex; - css::uno::Sequence<sal_Int8> m_aData; + css::uno::Sequence<sal_Int8> const m_aData; sal_Int32 m_nPos; public: @@ -75,7 +75,7 @@ private: void finalizeOutput(); css::uno::Sequence< sal_Int8 >& m_rSequence; double m_nResizeFactor; - sal_Int32 m_nMinimumResize; + sal_Int32 const m_nMinimumResize; sal_Int32 m_nSize; // the size of the virtual stream. This is not the size of the sequence, but the number of bytes written // into the stream at a given moment. diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 011a4f9b7f0d..927a3d39df40 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -52,7 +52,7 @@ public: class UStringMixEqual { - bool m_bCaseSensitive; + bool const m_bCaseSensitive; public: UStringMixEqual(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){} @@ -121,7 +121,7 @@ public: explicit mem_fun1_t(_fun_type pf) : M_f(pf) {} void operator()(Tp* p, Arg x) const { (p->*M_f)(x); } private: - _fun_type M_f; + _fun_type const M_f; }; template <class Tp, class Arg> diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx index 7934a6b6d7cf..c3d4ec178e92 100644 --- a/include/comphelper/string.hxx +++ b/include/comphelper/string.hxx @@ -339,7 +339,7 @@ COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const OUString &rLHS, const OUStr class COMPHELPER_DLLPUBLIC NaturalStringSorter { private: - css::lang::Locale m_aLocale; + css::lang::Locale const m_aLocale; css::uno::Reference< css::i18n::XCollator > m_xCollator; css::uno::Reference< css::i18n::XBreakIterator > m_xBI; public: diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx index ddca4d849245..fd5905edc821 100644 --- a/include/comphelper/threadpool.hxx +++ b/include/comphelper/threadpool.hxx @@ -92,7 +92,7 @@ private: std::mutex maMutex; std::condition_variable maTasksChanged; bool mbTerminate; - std::size_t mnWorkers; + std::size_t const mnWorkers; std::vector< std::unique_ptr<ThreadTask> > maTasks; std::vector< rtl::Reference< ThreadWorker > > maWorkers; }; diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx index f2c3adcc2a2c..51a9710f606d 100644 --- a/include/comphelper/unique_disposing_ptr.hxx +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -74,7 +74,7 @@ private: private: css::uno::Reference< css::lang::XComponent > m_xComponent; unique_disposing_ptr<T>& m_rItem; - bool mbComponentDLL; + bool const mbComponentDLL; public: TerminateListener(const css::uno::Reference< css::lang::XComponent > &rComponent, unique_disposing_ptr<T>& rItem, bool bComponentDLL) : |