summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-12 17:12:22 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-15 19:22:21 +0200
commiteaf0c263eb1a72a58d2a67cc0506ab022d7c4be4 (patch)
tree4c732e95b560235e83c6de4b5b96260b638fa88d /include
parent921ae49cd7e332d7e1ad702efe2198b2780cc829 (diff)
loplugin:staticconstfield improvements
And fix ScXMLCachedRowAttrAccess::Cache which was never setting its mnTab field, and hence would never be hit. And fix oox::xls::CellBlockBuffer, which was never setting mnCurrRow. Change-Id: I2c46aa050b9ebe3c2dc2e52579555f97945dd61c Reviewed-on: https://gerrit.libreoffice.org/61772 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/editeng/outliner.hxx2
-rw-r--r--include/svtools/svparser.hxx2
-rw-r--r--include/svx/ClassificationDialog.hxx1
-rw-r--r--include/svx/colrctrl.hxx2
-rw-r--r--include/vcl/filter/pdfdocument.hxx4
5 files changed, 3 insertions, 8 deletions
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index e0d93e3323e4..7e17dab21ece 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -605,7 +605,7 @@ private:
sal_Int32 nDepthChangedHdlPrevDepth;
sal_Int16 nMaxDepth;
- const sal_Int16 nMinDepth;
+ static constexpr sal_Int16 gnMinDepth = -1;
OutlinerMode nOutlinerMode;
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 68c6ee772666..b6333434a828 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -147,7 +147,7 @@ public:
// 'pWhichIds'. It has the length 'nWhichIds'.
// The WhichMap is not deleted.
SVT_DLLPUBLIC void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
- sal_uInt16 *pWhichIds,
+ sal_uInt16 const *pWhichIds,
sal_uInt16 nWhichIds );
/*========================================================================
diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx
index ba2fbec1487d..607f6565bdbc 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -60,7 +60,6 @@ private:
const std::function<void()> m_aParagraphSignHandler;
sal_Int32 m_nCurrentSelectedCategory;
- sal_Int16 const m_nInsertMarkings;
DECL_LINK(ButtonClicked, Button*, void);
DECL_LINK(SelectToolboxHdl, ToolBox*, void);
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 624376a7a46b..dd7a179da93e 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -83,8 +83,6 @@ friend class SvxColorChildWindow;
private:
XColorListRef pColorList;
VclPtr<SvxColorValueSet_docking> aColorSet;
- sal_uInt16 const nLeftSlot;
- sal_uInt16 const nRightSlot;
sal_uInt16 nCols;
sal_uInt16 nLines;
long nCount;
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 7735a52591bd..c245c815617b 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -196,15 +196,13 @@ class VCL_DLLPUBLIC PDFNameElement : public PDFElement
OString m_aValue;
/// Offset after the '/' token.
sal_uInt64 m_nLocation = 0;
- /// Length till the next token start.
- sal_uInt64 const m_nLength = 0;
public:
PDFNameElement();
bool Read(SvStream& rStream) override;
const OString& GetValue() const;
sal_uInt64 GetLocation() const;
- sal_uInt64 GetLength() const;
+ static sal_uInt64 GetLength() { return 0; }
};
/// Dictionary object: a set key-value pairs.