summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-12 11:08:24 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-12 17:45:54 +0100
commit638b670791d1a97b48c8246105870d6c484ced7d (patch)
treedc4f7f587a4522d917eb752b9498319ca9403cb6 /sd/inc
parentcebb74468478a2902d522b38bbedb4a2b536b392 (diff)
Revert "loplugin:constfields in sd"
This reverts commit 453879cfd8f4a8e22847043231a0929e4d50f238. Change-Id: Ic542fd6b1f09d71d8e6c9530198fe45151d75e16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90410 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx2
-rw-r--r--sd/inc/CustomAnimationPreset.hxx2
-rw-r--r--sd/inc/Outliner.hxx4
-rw-r--r--sd/inc/OutlinerIterator.hxx2
-rw-r--r--sd/inc/animations.hxx2
-rw-r--r--sd/inc/anminfo.hxx4
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/inc/sdfilter.hxx2
-rw-r--r--sd/inc/sdiocmpt.hxx2
-rw-r--r--sd/inc/sdpage.hxx2
-rw-r--r--sd/inc/sdxmlwrp.hxx4
-rw-r--r--sd/inc/undo/undoobjects.hxx2
12 files changed, 15 insertions, 15 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 26f1cef4a65c..a82642a8c178 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -253,7 +253,7 @@ private:
double mfGroupingAuto;
sal_Int32 mnLastPara;
sal_Int8 mnDepthFlags[PARA_LEVELS];
- sal_Int32 const mnGroupId;
+ sal_Int32 mnGroupId;
};
typedef std::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 220dedb9b0e3..b05f1675c6a7 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -73,7 +73,7 @@ typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
struct PresetCategory
{
- OUString const maLabel;
+ OUString maLabel;
EffectDescriptorList maEffects;
PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects )
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 11d79a2a1199..c95786577b62 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -45,12 +45,12 @@ class Window;
struct SearchSelection
{
/// 0-based index of the page that has the selection.
- int const m_nPage;
+ int m_nPage;
/**
* List of selection rectangles in twips -- multiple rectangles only in
* case the selection spans over more layout lines.
*/
- OString const m_aRectangles;
+ OString m_aRectangles;
SearchSelection(int nPage, const OString& rRectangles);
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index e78e9447d506..84ab712073ba 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -193,7 +193,7 @@ public:
private:
/// The wrapped outliner that is represented as object container.
- SdOutliner* const mpOutliner;
+ SdOutliner* mpOutliner;
/** Create an iterator. The object pointed to depends on the search
direction retrieved from the outliner object
diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx
index f5f8abf95917..72d31be5e9c1 100644
--- a/sd/inc/animations.hxx
+++ b/sd/inc/animations.hxx
@@ -36,7 +36,7 @@ struct AfterEffectNode
{
css::uno::Reference< css::animations::XAnimationNode > mxNode;
css::uno::Reference< css::animations::XAnimationNode > mxMaster;
- bool const mbOnNextEffect;
+ bool mbOnNextEffect;
AfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xMaster, bool bOnNextEffect )
: mxNode( xNode ), mxMaster( xMaster ), mbOnNextEffect( bOnNextEffect ) {}
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 08224994a2ce..1c27e7745df1 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -39,7 +39,7 @@ public:
css::presentation::AnimationSpeed meSpeed; ///< Speed of the animation
bool mbActive; ///< turned on?
bool mbDimPrevious; ///< Object fade out
- bool const mbIsMovie; ///< if group object than it is a sequence of them.
+ bool mbIsMovie; ///< if group object than it is a sequence of them.
bool mbDimHide; ///< hide rather than dim
Color maBlueScreen; ///< identifies "background pixels"
Color maDimColor; ///< for fading the object
@@ -49,7 +49,7 @@ public:
css::presentation::ClickAction meClickAction; ///< Action at mouse click
css::presentation::AnimationEffect meSecondEffect; ///< for object fading.
css::presentation::AnimationSpeed meSecondSpeed; ///< for object fading.
- OUString const maSecondSoundFile; ///< for object fading.
+ OUString maSecondSoundFile; ///< for object fading.
bool mbSecondSoundOn; ///< for object fading.
bool mbSecondPlayFull; ///< for object fading.
sal_uInt16 mnVerb; ///< for OLE object
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index b5b6e574ca0c..ab7c46c8614b 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -173,7 +173,7 @@ private:
SvxNumType mePageNumType;
::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel()
bool mbAllocDocSh; // => AllocModel()
- DocumentType const meDocType;
+ DocumentType meDocType;
std::unique_ptr<CharClass>
mpCharClass;
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index fb184ff10626..a5e4579843ae 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -55,7 +55,7 @@ protected:
SfxMedium& mrMedium;
::sd::DrawDocShell& mrDocShell;
SdDrawDocument& mrDocument;
- bool const mbIsDraw : 1;
+ bool mbIsDraw : 1;
void CreateStatusIndicator();
private:
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index 8afba8277c2d..fb1872f16832 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -30,7 +30,7 @@ protected:
SvStream& rStream;
sal_uInt32 nSubRecSiz;
sal_uInt32 nSubRecPos;
- StreamMode const nMode;
+ StreamMode nMode;
bool bOpen;
protected:
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index d9d43ec61aee..97463be5fa9f 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -383,7 +383,7 @@ private:
bool mbIsPrecious;
// page id of this page
- sal_uInt16 const mnPageId;
+ sal_uInt16 mnPageId;
/** clone the animations from this and set them to rTargetPage
* TTTT: Order is strange, should be the other way around by
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 9fe46506b9a0..84d3862b0c03 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -46,8 +46,8 @@ public:
bool Export() override;
private:
- SdXMLFilterMode const meFilterMode;
- sal_uLong const mnStoreVer;
+ SdXMLFilterMode meFilterMode;
+ sal_uLong mnStoreVer;
};
#endif // INCLUDED_SD_INC_SDXMLWRP_HXX
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 53b81b61d911..be3c5584c95d 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -108,7 +108,7 @@ public:
virtual void Redo() override;
private:
- SdrObjUserCall* const mpOldUserCall;
+ SdrObjUserCall* mpOldUserCall;
SdrObjUserCall* mpNewUserCall;
::tools::WeakReference<SdrObject> mxSdrObject;
};