summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-12 09:34:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-12 09:22:31 +0100
commit32097c33d7de74ed89a01e88d69b6ff0d1482512 (patch)
tree739255ba6130050149a55e9ca5864533302e00a0 /scripting
parentb480819dc4133f587eb960143128a7d85a44da9a (diff)
Revert "loplugin:constfields in scripting"
This reverts commit 383a4f883d4a2932167695c761611b998f773f0e. Now that we know that making fields has negative side effects like disabling assignment operator generation. Change-Id: I9fc04024b12a977481d010950244cff05e18bd74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90368 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'scripting')
-rw-r--r--scripting/source/basprov/baslibnode.hxx8
-rw-r--r--scripting/source/basprov/basmethnode.hxx4
-rw-r--r--scripting/source/basprov/basmodnode.hxx4
-rw-r--r--scripting/source/basprov/basscript.hxx2
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx4
-rw-r--r--scripting/source/dlgprov/dlgevtatt.hxx4
-rw-r--r--scripting/source/provider/ProviderCache.hxx2
-rw-r--r--scripting/source/stringresource/stringresource.cxx2
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx8
9 files changed, 19 insertions, 19 deletions
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index c44ce3a536b5..1124974644cc 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -43,12 +43,12 @@ namespace basprov
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_sScriptingContext;
- BasicManager* const m_pBasicManager;
+ OUString m_sScriptingContext;
+ BasicManager* m_pBasicManager;
css::uno::Reference< css::script::XLibraryContainer > m_xLibContainer;
css::uno::Reference< css::container::XNameContainer > m_xLibrary;
- OUString const m_sLibName;
- bool const m_bIsAppScript;
+ OUString m_sLibName;
+ bool m_bIsAppScript;
public:
BasicLibraryNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 95741eb11798..ce112afbf148 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -52,9 +52,9 @@ namespace basprov
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_sScriptingContext;
+ OUString m_sScriptingContext;
SbMethod* m_pMethod;
- bool const m_bIsAppScript;
+ bool m_bIsAppScript;
// properties
OUString m_sURI;
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 6ef63b58ba84..fa2010a5fc46 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -42,9 +42,9 @@ namespace basprov
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_sScriptingContext;
+ OUString m_sScriptingContext;
SbModule* m_pModule;
- bool const m_bIsAppScript;
+ bool m_bIsAppScript;
public:
BasicModuleNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 820a172d99de..ed86b9dcb378 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -50,7 +50,7 @@ namespace basprov
{
private:
SbMethodRef m_xMethod;
- OUString const m_funcName;
+ OUString m_funcName;
BasicManager* m_documentBasicManager;
css::uno::Reference< css::document::XScriptInvocationContext >
m_xDocumentScriptContext;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index c47465610503..1269395b01f5 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -82,7 +82,7 @@ namespace dlgprov
Reference< awt::XControl > m_xControl;
Reference< XInterface > m_xHandler;
Reference< beans::XIntrospectionAccess > m_xIntrospectionAccess;
- bool const m_bDialogProviderMode;
+ bool m_bDialogProviderMode;
virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet ) override;
@@ -100,7 +100,7 @@ namespace dlgprov
{
protected:
OUString msDialogCodeName;
- OUString const msDialogLibName;
+ OUString msDialogLibName;
Reference< script::XScriptListener > mxListener;
virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet ) override;
public:
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 2adcd03baa7a..239cb653040a 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -82,8 +82,8 @@ namespace dlgprov
{
private:
css::uno::Reference< css::script::XScriptListener > m_xScriptListener;
- OUString const m_sScriptType;
- OUString const m_sScriptCode;
+ OUString m_sScriptType;
+ OUString m_sScriptCode;
void firing_impl( const css::script::AllEventObject& Event, css::uno::Any* pRet );
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 3ad9bc5fab1a..9234d5bd6e6b 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -73,7 +73,7 @@ private:
css::uno::Sequence< OUString > m_sBlackList;
ProviderDetails_hash m_hProviderDetailsCache;
osl::Mutex m_mutex;
- css::uno::Sequence< css::uno::Any > const m_Sctx;
+ css::uno::Sequence< css::uno::Any > m_Sctx;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::lang::XMultiComponentFactory > m_xMgr;
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 25ea60dbb4cc..d059a087b274 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1293,7 +1293,7 @@ namespace {
class BinaryInput
{
- Sequence< sal_Int8 > const m_aData;
+ Sequence< sal_Int8 > m_aData;
Reference< XComponentContext > m_xContext;
const sal_Int8* m_pData;
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 0bec24e2a047..e3dc8ab7b670 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -184,8 +184,8 @@ namespace {
struct TranslatePropMap
{
- OUString const sEventInfo; //OO event name
- TranslateInfo const aTransInfo;
+ OUString sEventInfo; //OO event name
+ TranslateInfo aTransInfo;
};
}
@@ -200,7 +200,7 @@ namespace {
struct TypeList
{
uno::Type const * pTypeList;
- int const nListLength;
+ int nListLength;
};
}
@@ -309,7 +309,7 @@ public:
private:
Reference< XComponentContext > m_xCtx;
Reference< XInterface > m_xControl;
- bool const m_bDispose;
+ bool m_bDispose;
};
}