Kaydet (Commit) cc34b5a4 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:constfields in vbahelper

Change-Id: I6121e2b41a5e6116be8027fe5197ce53d8f6797f
Reviewed-on: https://gerrit.libreoffice.org/60562
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 99102d42
...@@ -238,7 +238,7 @@ typedef InheritedHelperInterfaceImpl< Ifc... > BaseColBase; ...@@ -238,7 +238,7 @@ typedef InheritedHelperInterfaceImpl< Ifc... > BaseColBase;
protected: protected:
css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess; css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
css::uno::Reference< css::container::XNameAccess > m_xNameAccess; css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
bool mbIgnoreCase; bool const mbIgnoreCase;
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) virtual css::uno::Any getItemByStringIndex( const OUString& sIndex )
......
...@@ -45,7 +45,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE; ...@@ -45,7 +45,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE;
class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
{ {
protected: protected:
sal_Int32 mnIndex; sal_Int32 const mnIndex;
css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::frame::XModel > m_xModel;
public: 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 ) {} 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 ) {}
......
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
}; };
private: private:
DOCUMENT_TYPE meDocType; DOCUMENT_TYPE const meDocType;
public: public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
......
...@@ -122,8 +122,8 @@ protected: ...@@ -122,8 +122,8 @@ protected:
struct EventQueueEntry struct EventQueueEntry
{ {
sal_Int32 mnEventId; sal_Int32 const mnEventId;
css::uno::Sequence< css::uno::Any > maArgs; css::uno::Sequence< css::uno::Any > const maArgs;
/*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {} /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {}
EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {} EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {}
}; };
......
...@@ -47,7 +47,7 @@ class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE ...@@ -47,7 +47,7 @@ class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE
protected: protected:
css::uno::Reference< css::beans::XPropertySet > mxFont; css::uno::Reference< css::beans::XPropertySet > mxFont;
css::uno::Reference< css::container::XIndexAccess > mxPalette; css::uno::Reference< css::container::XIndexAccess > mxPalette;
bool mbFormControl; bool const mbFormControl;
public: public:
// use local constants there is no need to expose these constants // use local constants there is no need to expose these constants
......
...@@ -243,9 +243,9 @@ private: ...@@ -243,9 +243,9 @@ private:
css::uno::Reference< css::awt::XWindow > mxWindow; css::uno::Reference< css::awt::XWindow > mxWindow;
css::uno::Reference< css::beans::XPropertySet > mxModelProps; css::uno::Reference< css::beans::XPropertySet > mxModelProps;
css::uno::Reference< css::awt::XUnitConversion > mxUnitConv; css::uno::Reference< css::awt::XUnitConversion > mxUnitConv;
double mfOffsetX; double const mfOffsetX;
double mfOffsetY; double const mfOffsetY;
bool mbDialog; bool const mbDialog;
}; };
class VBAHELPER_DLLPUBLIC ContainerUtilities class VBAHELPER_DLLPUBLIC ContainerUtilities
......
...@@ -64,7 +64,7 @@ protected: ...@@ -64,7 +64,7 @@ protected:
css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::drawing::XShape > m_xShape;
css::uno::Reference< css::drawing::XShapes > m_xShapes; css::uno::Reference< css::drawing::XShapes > m_xShapes;
css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; 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::Reference< css::frame::XModel > m_xModel;
css::uno::Any m_aRange; css::uno::Any m_aRange;
void addListeners(); void addListeners();
......
...@@ -432,8 +432,8 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag ) ...@@ -432,8 +432,8 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag )
struct PointerStyles struct PointerStyles
{ {
long msoPointerStyle; long const msoPointerStyle;
PointerStyle loPointStyle; PointerStyle const loPointStyle;
}; };
// 1 -> 1 map of styles ( some dubious choices in there though ) // 1 -> 1 map of styles ( some dubious choices in there though )
......
...@@ -148,8 +148,8 @@ class ControlsEnumWrapper : public EnumerationHelper_BASE ...@@ -148,8 +148,8 @@ class ControlsEnumWrapper : public EnumerationHelper_BASE
uno::Reference<container::XIndexAccess > m_xIndexAccess; uno::Reference<container::XIndexAccess > m_xIndexAccess;
uno::Reference<awt::XControl > m_xDlg; uno::Reference<awt::XControl > m_xDlg;
uno::Reference< frame::XModel > m_xModel; uno::Reference< frame::XModel > m_xModel;
double mfOffsetX; double const mfOffsetX;
double mfOffsetY; double const mfOffsetY;
sal_Int32 nIndex; sal_Int32 nIndex;
public: public:
......
...@@ -54,8 +54,8 @@ public: ...@@ -54,8 +54,8 @@ public:
private: private:
css::uno::Reference< css::awt::XControl > mxDialog; css::uno::Reference< css::awt::XControl > mxDialog;
css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::frame::XModel > mxModel;
double mfOffsetX; double const mfOffsetX;
double mfOffsetY; double const mfOffsetY;
}; };
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX
......
...@@ -29,8 +29,8 @@ class ListPropListener : public PropListener ...@@ -29,8 +29,8 @@ class ListPropListener : public PropListener
{ {
private: private:
uno::Reference< beans::XPropertySet > m_xProps; uno::Reference< beans::XPropertySet > m_xProps;
uno::Any m_pvargIndex; uno::Any const m_pvargIndex;
uno::Any m_pvarColumn; uno::Any const m_pvarColumn;
public: public:
ListPropListener( const uno::Reference< beans::XPropertySet >& xProps, const uno::Any& pvargIndex, const uno::Any& pvarColumn ); ListPropListener( const uno::Reference< beans::XPropertySet >& xProps, const uno::Any& pvargIndex, const uno::Any& pvarColumn );
......
...@@ -29,7 +29,7 @@ const OUString SVALUE( "MultiPageValue" ); ...@@ -29,7 +29,7 @@ const OUString SVALUE( "MultiPageValue" );
class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess > class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess >
{ {
sal_Int32 mnPages; sal_Int32 const mnPages;
public: public:
explicit PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {} explicit PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
virtual ::sal_Int32 SAL_CALL getCount() override { return mnPages; } virtual ::sal_Int32 SAL_CALL getCount() override { return mnPages; }
......
...@@ -29,7 +29,7 @@ typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XTextBox, css::s ...@@ -29,7 +29,7 @@ typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XTextBox, css::s
class ScVbaTextBox : public TextBoxImpl_BASE class ScVbaTextBox : public TextBoxImpl_BASE
{ {
bool mbDialog; bool const mbDialog;
public: 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 ); 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 // Attributes
......
...@@ -95,7 +95,7 @@ class ScVbaColorFormat : public ScVbaColorFormat_BASE ...@@ -95,7 +95,7 @@ class ScVbaColorFormat : public ScVbaColorFormat_BASE
private: private:
css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
ScVbaFillFormat *m_pFillFormat; ScVbaFillFormat *m_pFillFormat;
sal_Int16 m_nColorFormatType; sal_Int16 const m_nColorFormatType;
sal_Int32 m_nFillFormatBackColor; sal_Int32 m_nFillFormatBackColor;
protected: protected:
virtual OUString getServiceImplName() override; virtual OUString getServiceImplName() override;
......
...@@ -35,8 +35,8 @@ class ScVbaCommandBar : public CommandBar_BASE ...@@ -35,8 +35,8 @@ class ScVbaCommandBar : public CommandBar_BASE
private: private:
VbaCommandBarHelperRef pCBarHelper; VbaCommandBarHelperRef pCBarHelper;
css::uno::Reference< css::container::XIndexAccess > m_xBarSettings; css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
OUString m_sResourceUrl; OUString const m_sResourceUrl;
bool m_bIsMenu; bool const m_bIsMenu;
public: public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
......
...@@ -34,7 +34,7 @@ class ScVbaCommandBarControl : public CommandBarControl_BASE ...@@ -34,7 +34,7 @@ class ScVbaCommandBarControl : public CommandBarControl_BASE
{ {
protected: protected:
VbaCommandBarHelperRef pCBarHelper; VbaCommandBarHelperRef pCBarHelper;
OUString m_sResourceUrl; OUString const m_sResourceUrl;
css::uno::Reference< css::container::XIndexAccess > m_xCurrentSettings; css::uno::Reference< css::container::XIndexAccess > m_xCurrentSettings;
css::uno::Reference< css::container::XIndexAccess > m_xBarSettings; css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
css::uno::Sequence< css::beans::PropertyValue > m_aPropertyValues; css::uno::Sequence< css::beans::PropertyValue > m_aPropertyValues;
......
...@@ -32,7 +32,7 @@ class ScVbaCommandBarControls : public CommandBarControls_BASE ...@@ -32,7 +32,7 @@ class ScVbaCommandBarControls : public CommandBarControls_BASE
private: private:
VbaCommandBarHelperRef pCBarHelper; VbaCommandBarHelperRef pCBarHelper;
css::uno::Reference< css::container::XIndexAccess > m_xBarSettings; css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
OUString m_sResourceUrl; OUString const m_sResourceUrl;
bool m_bIsMenu; bool m_bIsMenu;
static css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const OUString& sCommandURL, static css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const OUString& sCommandURL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment