[Libreoffice-commits] core.git: include/vbahelper vbahelper/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 16 07:17:40 UTC 2020
include/vbahelper/vbacollectionimpl.hxx | 2 +-
include/vbahelper/vbadialogbase.hxx | 2 +-
include/vbahelper/vbadocumentsbase.hxx | 2 +-
include/vbahelper/vbaeventshelperbase.hxx | 4 ++--
include/vbahelper/vbafontbase.hxx | 2 +-
include/vbahelper/vbahelper.hxx | 6 +++---
include/vbahelper/vbashape.hxx | 2 +-
vbahelper/source/msforms/vbacontrol.cxx | 4 ++--
vbahelper/source/msforms/vbacontrols.cxx | 4 ++--
vbahelper/source/msforms/vbacontrols.hxx | 4 ++--
vbahelper/source/msforms/vbalistcontrolhelper.cxx | 4 ++--
vbahelper/source/msforms/vbamultipage.cxx | 2 +-
vbahelper/source/msforms/vbatextbox.hxx | 2 +-
vbahelper/source/vbahelper/vbacolorformat.hxx | 2 +-
vbahelper/source/vbahelper/vbacommandbar.hxx | 4 ++--
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 2 +-
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx | 2 +-
17 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 1133c399ff7a5d33c5351f776cc24d3b48592eba
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Mar 15 18:32:13 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 16 08:17:02 2020 +0100
Revert "loplugin:constfields in vbahelper"
This reverts commit cc34b5a4c2d231de3882508654f15765d29f44c9.
Change-Id: I891826d88dd4e8bc8e6896889f4c1880c798080f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90543
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 05c9e37bf638..73058d0f4b7c 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 const mbIgnoreCase;
+ bool 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 c5578f10d009..4c7a2636917a 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 const mnIndex;
+ sal_Int32 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 6530d734a0c9..ac6d316a0256 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -56,7 +56,7 @@ public:
};
private:
- DOCUMENT_TYPE const meDocType;
+ DOCUMENT_TYPE meDocType;
public:
/// @throws css::uno::RuntimeException
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index f1bf3a805da9..91c8bf72c7c5 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -119,8 +119,8 @@ protected:
struct EventQueueEntry
{
- sal_Int32 const mnEventId;
- css::uno::Sequence< css::uno::Any > const maArgs;
+ sal_Int32 mnEventId;
+ css::uno::Sequence< css::uno::Any > 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 d12e13ddfbf1..32c8270e1783 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 const mbFormControl;
+ bool 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 d130c4e6ea1c..f56b34730c08 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -241,9 +241,9 @@ private:
css::uno::Reference< css::awt::XWindow > mxWindow;
css::uno::Reference< css::beans::XPropertySet > mxModelProps;
css::uno::Reference< css::awt::XUnitConversion > mxUnitConv;
- double const mfOffsetX;
- double const mfOffsetY;
- bool const mbDialog;
+ double mfOffsetX;
+ double mfOffsetY;
+ bool mbDialog;
};
class VBAHELPER_DLLPUBLIC ContainerUtilities
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 59581dfe81ee..8c723f3d2cd5 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 const m_nType;
+ sal_Int32 m_nType;
css::uno::Reference< css::frame::XModel > m_xModel;
void addListeners();
/// @throws css::uno::RuntimeException
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index da1287d2e60c..8efb94de7780 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -436,8 +436,8 @@ namespace {
struct PointerStyles
{
- long const msoPointerStyle;
- PointerStyle const loPointStyle;
+ long msoPointerStyle;
+ PointerStyle loPointStyle;
};
}
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index c019c376c2d7..56a0b80aebe2 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 const mfOffsetX;
- double const mfOffsetY;
+ double mfOffsetX;
+ double mfOffsetY;
sal_Int32 nIndex;
public:
diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx
index 4f1b01c6876c..1e9d95042633 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 const mfOffsetX;
- double const mfOffsetY;
+ double mfOffsetX;
+ double mfOffsetY;
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index b1601f99ec43..02a500aa2f8c 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -32,8 +32,8 @@ class ListPropListener : public PropListener
{
private:
uno::Reference< beans::XPropertySet > m_xProps;
- uno::Any const m_pvargIndex;
- uno::Any const m_pvarColumn;
+ uno::Any m_pvargIndex;
+ uno::Any 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 58ca2182cda6..a23949ad9dc0 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -31,7 +31,7 @@ namespace {
class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess >
{
- sal_Int32 const mnPages;
+ sal_Int32 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 65857b86b4ad..9a2b969423d2 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -30,7 +30,7 @@ typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XTextBox, css::s
class ScVbaTextBox : public TextBoxImpl_BASE
{
- bool const mbDialog;
+ bool 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, std::unique_ptr<ov::AbstractGeometryAttributes> pGeomHelper, bool bDialog = false );
// Attributes
diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx
index 888228e77610..0e94db6de7e6 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.hxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.hxx
@@ -94,7 +94,7 @@ class ScVbaColorFormat : public ScVbaColorFormat_BASE
private:
css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
ScVbaFillFormat *m_pFillFormat;
- sal_Int16 const m_nColorFormatType;
+ sal_Int16 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 b6508760625e..8aa9675adb26 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.hxx
@@ -31,8 +31,8 @@ class ScVbaCommandBar : public CommandBar_BASE
private:
VbaCommandBarHelperRef pCBarHelper;
css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
- OUString const m_sResourceUrl;
- bool const m_bIsMenu;
+ OUString m_sResourceUrl;
+ bool m_bIsMenu;
public:
/// @throws css::uno::RuntimeException
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
index 700868e9fe5a..348518b5ba2e 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 const m_sResourceUrl;
+ OUString 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 f30dc586eee7..5e86b359fa23 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
@@ -30,7 +30,7 @@ class ScVbaCommandBarControls : public CommandBarControls_BASE
private:
VbaCommandBarHelperRef pCBarHelper;
css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
- OUString const m_sResourceUrl;
+ OUString m_sResourceUrl;
bool m_bIsMenu;
static css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const OUString& sCommandURL,
More information about the Libreoffice-commits
mailing list