mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "loplugin:constfields in vbahelper"

Browse Source 
This reverts commit cc34b5a4c2.

Change-Id: I891826d88dd4e8bc8e6896889f4c1880c798080f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90543
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-03-15 18:32:13 +02:00
parent 5dcbd1bb55
commit 1133c399ff
17 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vbahelper/vbacollectionimpl.hxx
View File

@@ -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 const mbIgnoreCase; bool 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 )

2
include/vbahelper/vbadialogbase.hxx
View File

@@ -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 const mnIndex; sal_Int32 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 ) {}

2
include/vbahelper/vbadocumentsbase.hxx
View File

@@ -56,7 +56,7 @@ public:
}; };
private: private:
DOCUMENT_TYPE const meDocType; DOCUMENT_TYPE meDocType;
public: public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException

4
include/vbahelper/vbaeventshelperbase.hxx
View File

@@ -119,8 +119,8 @@ protected:
struct EventQueueEntry struct EventQueueEntry
{ {
sal_Int32 const mnEventId; sal_Int32 mnEventId;
css::uno::Sequence< css::uno::Any > const maArgs; css::uno::Sequence< css::uno::Any > 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 ) {}
}; };

2
include/vbahelper/vbafontbase.hxx
View File

@@ -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 const mbFormControl; bool 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

6
include/vbahelper/vbahelper.hxx
View File

@@ -241,9 +241,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 const mfOffsetX; double mfOffsetX;
double const mfOffsetY; double mfOffsetY;
bool const mbDialog; bool mbDialog;
}; };
class VBAHELPER_DLLPUBLIC ContainerUtilities class VBAHELPER_DLLPUBLIC ContainerUtilities

2
include/vbahelper/vbashape.hxx
View File

@@ -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 const m_nType; sal_Int32 m_nType;
css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::frame::XModel > m_xModel;
void addListeners(); void addListeners();
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException

4
vbahelper/source/msforms/vbacontrol.cxx
View File

@@ -436,8 +436,8 @@ namespace {
struct PointerStyles struct PointerStyles
{ {
long const msoPointerStyle; long msoPointerStyle;
PointerStyle const loPointStyle; PointerStyle loPointStyle;
}; };
} }

4
vbahelper/source/msforms/vbacontrols.cxx
View File

@@ -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 const mfOffsetX; double mfOffsetX;
double const mfOffsetY; double mfOffsetY;
sal_Int32 nIndex; sal_Int32 nIndex;
public: public:

4
vbahelper/source/msforms/vbacontrols.hxx
View File

@@ -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 const mfOffsetX; double mfOffsetX;
double const mfOffsetY; double mfOffsetY;
}; };
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX

4
vbahelper/source/msforms/vbalistcontrolhelper.cxx
View File

@@ -32,8 +32,8 @@ class ListPropListener : public PropListener
{ {
private: private:
uno::Reference< beans::XPropertySet > m_xProps; uno::Reference< beans::XPropertySet > m_xProps;
uno::Any const m_pvargIndex; uno::Any m_pvargIndex;
uno::Any const m_pvarColumn; uno::Any 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 );

2
vbahelper/source/msforms/vbamultipage.cxx
View File

@@ -31,7 +31,7 @@ namespace {
class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess > class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess >
{ {
sal_Int32 const mnPages; sal_Int32 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; }

2
vbahelper/source/msforms/vbatextbox.hxx
View File

@@ -30,7 +30,7 @@ typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XTextBox, css::s
class ScVbaTextBox : public TextBoxImpl_BASE class ScVbaTextBox : public TextBoxImpl_BASE
{ {
bool const mbDialog; bool 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, std::unique_ptr<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, std::unique_ptr<ov::AbstractGeometryAttributes> pGeomHelper, bool bDialog = false );
// Attributes // Attributes

2
vbahelper/source/vbahelper/vbacolorformat.hxx
View File

@@ -94,7 +94,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 const m_nColorFormatType; sal_Int16 m_nColorFormatType;
sal_Int32 m_nFillFormatBackColor; sal_Int32 m_nFillFormatBackColor;
protected: protected:
virtual OUString getServiceImplName() override; virtual OUString getServiceImplName() override;

4
vbahelper/source/vbahelper/vbacommandbar.hxx
View File

@@ -31,8 +31,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 const m_sResourceUrl; OUString m_sResourceUrl;
bool const m_bIsMenu; bool m_bIsMenu;
public: public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException

2
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
View File

@@ -34,7 +34,7 @@ class ScVbaCommandBarControl : public CommandBarControl_BASE
{ {
protected: protected:
VbaCommandBarHelperRef pCBarHelper; VbaCommandBarHelperRef pCBarHelper;
OUString const m_sResourceUrl; OUString 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;

2
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
View File

@@ -30,7 +30,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 const m_sResourceUrl; OUString 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,