diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-17 11:21:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-18 08:56:48 +0200 |
commit | cc34b5a4c2d231de3882508654f15765d29f44c9 (patch) | |
tree | 8986ba3c3db40749ee0ec2af17d31614344c34fc | |
parent | 99102d4263189d347c7a7d0df8fd782e8c4c8ad5 (diff) |
loplugin:constfields in vbahelper
Change-Id: I6121e2b41a5e6116be8027fe5197ce53d8f6797f
Reviewed-on: https://gerrit.libreoffice.org/60562
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | include/vbahelper/vbacollectionimpl.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbadialogbase.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbadocumentsbase.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbaeventshelperbase.hxx | 4 | ||||
-rw-r--r-- | include/vbahelper/vbafontbase.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbahelper.hxx | 6 | ||||
-rw-r--r-- | include/vbahelper/vbashape.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrols.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrols.hxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistcontrolhelper.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbamultipage.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbatextbox.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacolorformat.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbar.hxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarcontrols.hxx | 2 |
17 files changed, 25 insertions, 25 deletions
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 790e68f86907..f2adf5b302e8 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -238,7 +238,7 @@ typedef InheritedHelperInterfaceImpl< Ifc... > BaseColBase; protected: css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess; css::uno::Reference< css::container::XNameAccess > m_xNameAccess; - bool mbIgnoreCase; + bool const mbIgnoreCase; /// @throws css::uno::RuntimeException virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index 4c7a2636917a..c5578f10d009 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.hxx @@ -45,7 +45,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE; class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE { protected: - sal_Int32 mnIndex; + sal_Int32 const mnIndex; css::uno::Reference< css::frame::XModel > m_xModel; public: VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel( xModel ) {} diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx index ac6d316a0256..6530d734a0c9 100644 --- a/include/vbahelper/vbadocumentsbase.hxx +++ b/include/vbahelper/vbadocumentsbase.hxx @@ -56,7 +56,7 @@ public: }; private: - DOCUMENT_TYPE meDocType; + DOCUMENT_TYPE const meDocType; public: /// @throws css::uno::RuntimeException diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 042ad7439b8f..777815ce20a1 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -122,8 +122,8 @@ protected: struct EventQueueEntry { - sal_Int32 mnEventId; - css::uno::Sequence< css::uno::Any > maArgs; + sal_Int32 const mnEventId; + css::uno::Sequence< css::uno::Any > const maArgs; /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {} EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {} }; diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 32c8270e1783..d12e13ddfbf1 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -47,7 +47,7 @@ class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE protected: css::uno::Reference< css::beans::XPropertySet > mxFont; css::uno::Reference< css::container::XIndexAccess > mxPalette; - bool mbFormControl; + bool const mbFormControl; public: // use local constants there is no need to expose these constants diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index ff9eca3f232f..e070a29d59ca 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -243,9 +243,9 @@ private: css::uno::Reference< css::awt::XWindow > mxWindow; css::uno::Reference< css::beans::XPropertySet > mxModelProps; css::uno::Reference< css::awt::XUnitConversion > mxUnitConv; - double mfOffsetX; - double mfOffsetY; - bool mbDialog; + double const mfOffsetX; + double const mfOffsetY; + bool const mbDialog; }; class VBAHELPER_DLLPUBLIC ContainerUtilities diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 11305dc2c48e..3cdf74abe312 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -64,7 +64,7 @@ protected: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::drawing::XShapes > m_xShapes; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; - sal_Int32 m_nType; + sal_Int32 const m_nType; css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Any m_aRange; void addListeners(); diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 8ea64d041ee5..e221592dcafe 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -432,8 +432,8 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag ) struct PointerStyles { - long msoPointerStyle; - PointerStyle loPointStyle; + long const msoPointerStyle; + PointerStyle const loPointStyle; }; // 1 -> 1 map of styles ( some dubious choices in there though ) diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index be3a5dc82b61..01abc34f67dd 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -148,8 +148,8 @@ class ControlsEnumWrapper : public EnumerationHelper_BASE uno::Reference<container::XIndexAccess > m_xIndexAccess; uno::Reference<awt::XControl > m_xDlg; uno::Reference< frame::XModel > m_xModel; - double mfOffsetX; - double mfOffsetY; + double const mfOffsetX; + double const mfOffsetY; sal_Int32 nIndex; public: diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx index 1e9d95042633..4f1b01c6876c 100644 --- a/vbahelper/source/msforms/vbacontrols.hxx +++ b/vbahelper/source/msforms/vbacontrols.hxx @@ -54,8 +54,8 @@ public: private: css::uno::Reference< css::awt::XControl > mxDialog; css::uno::Reference< css::frame::XModel > mxModel; - double mfOffsetX; - double mfOffsetY; + double const mfOffsetX; + double const mfOffsetY; }; #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index 308c0934ece5..9f72bda981c1 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -29,8 +29,8 @@ class ListPropListener : public PropListener { private: uno::Reference< beans::XPropertySet > m_xProps; - uno::Any m_pvargIndex; - uno::Any m_pvarColumn; + uno::Any const m_pvargIndex; + uno::Any const m_pvarColumn; public: ListPropListener( const uno::Reference< beans::XPropertySet >& xProps, const uno::Any& pvargIndex, const uno::Any& pvarColumn ); diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 89282b4b1249..f3b67a57e987 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -29,7 +29,7 @@ const OUString SVALUE( "MultiPageValue" ); class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess > { - sal_Int32 mnPages; + sal_Int32 const mnPages; public: explicit PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {} virtual ::sal_Int32 SAL_CALL getCount() override { return mnPages; } diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index 8081471ba118..54d10999da12 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -29,7 +29,7 @@ typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XTextBox, css::s class ScVbaTextBox : public TextBoxImpl_BASE { - bool mbDialog; + bool const mbDialog; public: ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false ); // Attributes diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index 9504e4ef3789..d1573a0f0b5d 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -95,7 +95,7 @@ class ScVbaColorFormat : public ScVbaColorFormat_BASE private: css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; ScVbaFillFormat *m_pFillFormat; - sal_Int16 m_nColorFormatType; + sal_Int16 const m_nColorFormatType; sal_Int32 m_nFillFormatBackColor; protected: virtual OUString getServiceImplName() override; diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index 46e273b207fd..91a0fe6f0144 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -35,8 +35,8 @@ class ScVbaCommandBar : public CommandBar_BASE private: VbaCommandBarHelperRef pCBarHelper; css::uno::Reference< css::container::XIndexAccess > m_xBarSettings; - OUString m_sResourceUrl; - bool m_bIsMenu; + OUString const m_sResourceUrl; + bool const m_bIsMenu; public: /// @throws css::uno::RuntimeException diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index 348518b5ba2e..700868e9fe5a 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -34,7 +34,7 @@ class ScVbaCommandBarControl : public CommandBarControl_BASE { protected: VbaCommandBarHelperRef pCBarHelper; - OUString m_sResourceUrl; + OUString const m_sResourceUrl; css::uno::Reference< css::container::XIndexAccess > m_xCurrentSettings; css::uno::Reference< css::container::XIndexAccess > m_xBarSettings; css::uno::Sequence< css::beans::PropertyValue > m_aPropertyValues; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx index aae4de66c891..f82651e9c96c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx @@ -32,7 +32,7 @@ class ScVbaCommandBarControls : public CommandBarControls_BASE private: VbaCommandBarHelperRef pCBarHelper; css::uno::Reference< css::container::XIndexAccess > m_xBarSettings; - OUString m_sResourceUrl; + OUString const m_sResourceUrl; bool m_bIsMenu; static css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const OUString& sCommandURL, |