summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-10 13:49:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 06:15:21 +0000
commit5c84f40ea2e86bf85c0a59201faf1431f16aee40 (patch)
tree43a8b61f71052b4e3202f334fce8c60e52827fed /sc/inc
parentfe82f6fc5cbd638972571a33f04e95971507bba9 (diff)
loplugin:constantfunction
update the plugin similarly to commit 3ee3b36ae0c064fb5c81268d8d63444309d1b970 Author: Stephan Bergmann <sbergman@redhat.com> Date: Fri Oct 7 12:05:49 2016 +0200 loplugin:staticmethods: Don't be fooled by decls starting with macros Change-Id: I98ac3216d5acf89a49a26feb089ae2fd34e6e510 Reviewed-on: https://gerrit.libreoffice.org/29665 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/colorscale.hxx2
-rw-r--r--sc/inc/compiler.hxx4
-rw-r--r--sc/inc/document.hxx2
3 files changed, 3 insertions, 5 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index d9a9bd12133e..840b6824963d 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -361,7 +361,7 @@ public:
virtual condformat::ScFormatEntryType GetType() const override;
- static ScIconSetMap* getIconSetMap();
+ static const ScIconSetMap g_IconSetMap[];
static BitmapEx& getBitmap(sc::IconSetBitmapMap& rBitmapMap, ScIconSetType eType, sal_Int32 nIndex);
typedef ScIconSetFormatData::Entries_t::iterator iterator;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 8c6485627cd1..20423ef364fa 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -255,13 +255,13 @@ private:
static CharClass *pCharClassEnglish; // character classification for en_US locale
static const Convention *pConventions[ formula::FormulaGrammar::CONV_LAST ];
- static struct AddInMap
+ static const struct AddInMap
{
const char* pODFF;
const char* pEnglish;
const char* pOriginal; // programmatical name
const char* pUpper; // upper case programmatical name
- } maAddInMap[];
+ } g_aAddInMap[];
static const AddInMap* GetAddInMap();
static size_t GetAddInMapCount();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2dbe866a5769..3994b83e9296 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1930,8 +1930,6 @@ public:
bool GetHasMacroFunc() const { return bHasMacroFunc; }
void SetHasMacroFunc(bool bSet) { bHasMacroFunc = bSet; }
- static bool CheckMacroWarn();
-
void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; }
bool HasRangeOverflow() const { return nRangeOverflowType != 0; }
SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; }