[Libreoffice-commits] core.git: sd/inc sd/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 16:46:33 UTC 2020
sd/inc/CustomAnimationEffect.hxx | 2
sd/inc/CustomAnimationPreset.hxx | 2
sd/inc/Outliner.hxx | 4
sd/inc/OutlinerIterator.hxx | 2
sd/inc/animations.hxx | 2
sd/inc/anminfo.hxx | 4
sd/inc/drawdoc.hxx | 2
sd/inc/sdfilter.hxx | 2
sd/inc/sdiocmpt.hxx | 2
sd/inc/sdpage.hxx | 2
sd/inc/sdxmlwrp.hxx | 4
sd/inc/undo/undoobjects.hxx | 2
sd/source/core/CustomAnimationEffect.cxx | 2
sd/source/core/EffectMigration.cxx | 4
sd/source/core/annotations/Annotation.cxx | 4
sd/source/core/stlpool.cxx | 2
sd/source/core/stlsheet.cxx | 4
sd/source/filter/eppt/eppt.hxx | 10 -
sd/source/filter/eppt/epptbase.hxx | 10 -
sd/source/filter/eppt/pptexsoundcollection.hxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/html/htmlex.hxx | 2
sd/source/filter/ppt/pptatom.hxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 16 +--
sd/source/ui/animations/CustomAnimationDialog.hxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 8 -
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 8 -
sd/source/ui/annotations/annotationtag.hxx | 4
sd/source/ui/annotations/annotationwindow.hxx | 2
sd/source/ui/controller/displaymodecontroller.cxx | 2
sd/source/ui/controller/slidelayoutcontroller.cxx | 2
sd/source/ui/dlg/TemplateScanner.cxx | 4
sd/source/ui/dlg/headerfooterdlg.cxx | 6 -
sd/source/ui/framework/factories/ChildWindowPane.hxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 6 -
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 2
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 2
sd/source/ui/inc/AccessibleViewForwarder.hxx | 2
sd/source/ui/inc/Client.hxx | 2
sd/source/ui/inc/DrawDocShell.hxx | 4
sd/source/ui/inc/EventMultiplexer.hxx | 2
sd/source/ui/inc/MasterPageObserver.hxx | 2
sd/source/ui/inc/OutlineView.hxx | 2
sd/source/ui/inc/RemoteServer.hxx | 4
sd/source/ui/inc/SlideTransitionPane.hxx | 2
sd/source/ui/inc/TemplateScanner.hxx | 4
sd/source/ui/inc/ViewShellHint.hxx | 2
sd/source/ui/inc/copydlg.hxx | 4
sd/source/ui/inc/dlgsnap.hxx | 2
sd/source/ui/inc/framework/Configuration.hxx | 2
sd/source/ui/inc/fuinsert.hxx | 2
sd/source/ui/inc/inspagob.hxx | 2
sd/source/ui/inc/prltempl.hxx | 2
sd/source/ui/inc/sdxfer.hxx | 2
sd/source/ui/inc/slideshow.hxx | 2
sd/source/ui/inc/smarttag.hxx | 2
sd/source/ui/inc/tabtempl.hxx | 18 +--
sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx | 2
sd/source/ui/inc/undolayer.hxx | 26 ++---
sd/source/ui/inc/undopage.hxx | 52 +++++-----
sd/source/ui/inc/unmodpg.hxx | 2
sd/source/ui/inc/unoaprms.hxx | 2
sd/source/ui/inc/unosrch.hxx | 2
sd/source/ui/inc/vectdlg.hxx | 4
sd/source/ui/remotecontrol/BufferedStreamSocket.hxx | 2
sd/source/ui/remotecontrol/Server.cxx | 4
sd/source/ui/remotecontrol/ZeroconfService.hxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 4
sd/source/ui/sidebar/MasterPageContainerProviders.hxx | 6 -
sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 6 -
sd/source/ui/sidebar/MasterPageContainerQueue.hxx | 2
sd/source/ui/sidebar/MasterPageDescriptor.hxx | 6 -
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 2
sd/source/ui/sidebar/SlideBackground.hxx | 14 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slideshow/slideshowviewimpl.hxx | 6 -
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 2
sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx | 2
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 4
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 6 -
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 4
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 6 -
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 4
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 2
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 8 -
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 6 -
sd/source/ui/table/tableobjectbar.hxx | 2
sd/source/ui/uitest/uiobject.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 4
sd/source/ui/unoidl/unoobj.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 6 -
sd/source/ui/view/ViewShellManager.cxx | 2
96 files changed, 210 insertions(+), 210 deletions(-)
New commits:
commit 638b670791d1a97b48c8246105870d6c484ced7d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Mar 12 11:08:24 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 17:45:54 2020 +0100
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 at collabora.co.uk>
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;
};
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index e5da2e3fbadd..2004b88564f8 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2779,7 +2779,7 @@ struct ImplStlTextGroupSortHelper
{
explicit ImplStlTextGroupSortHelper( bool bReverse ) : mbReverse( bReverse ) {};
bool operator()( const CustomAnimationEffectPtr& p1, const CustomAnimationEffectPtr& p2 );
- bool const mbReverse;
+ bool mbReverse;
sal_Int32 getTargetParagraph( const CustomAnimationEffectPtr& p1 );
};
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index c5fb8e1be584..8a62c180d82f 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -51,7 +51,7 @@ namespace {
struct deprecated_FadeEffect_conversion_table_entry
{
- FadeEffect const meFadeEffect;
+ FadeEffect meFadeEffect;
const char* mpPresetId;
};
@@ -221,7 +221,7 @@ namespace {
struct deprecated_AnimationEffect_conversion_table_entry
{
- AnimationEffect const meEffect;
+ AnimationEffect meEffect;
const char* mpPresetId;
const char* mpPresetSubType;
};
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index b59158d1f64d..bd0feacf8a68 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -113,7 +113,7 @@ private:
// disposed, do it here.
virtual void SAL_CALL disposing() override;
- sal_uInt32 const m_nId;
+ sal_uInt32 m_nId;
SdPage* mpPage;
RealPoint2D m_Position;
RealSize2D m_Size;
@@ -133,7 +133,7 @@ public:
protected:
rtl::Reference< Annotation > mxAnnotation;
- bool const mbInsert;
+ bool mbInsert;
int mnIndex;
};
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 4562a27df981..93fbda2d55ae 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -605,7 +605,7 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate
{
return sheet.GetFamily() == meFamily;
}
- SfxStyleFamily const meFamily;
+ SfxStyleFamily meFamily;
};
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 8e9a91d4b854..ab8e01cfd629 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -572,8 +572,8 @@ namespace
{
struct ApiNameMap
{
- OUStringLiteral const mpApiName;
- sal_uInt32 const mnHelpId;
+ OUStringLiteral mpApiName;
+ sal_uInt32 mnHelpId;
} const pApiNameMap[]
= { { OUStringLiteral("title"), HID_PSEUDOSHEET_TITLE },
{ OUStringLiteral("subtitle"), HID_PSEUDOSHEET_SUBTITLE },
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index f3fcfe4be1fe..7699c09158fe 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -63,8 +63,8 @@ class SotStorage;
struct EPPTHyperlink
{
- OUString const aURL;
- sal_uInt32 const nType; // bit 0-7 : type ( 1: click action to a slide )
+ OUString aURL;
+ sal_uInt32 nType; // bit 0-7 : type ( 1: click action to a slide )
// ( 2: hyperlink url )
// bit 8-23: index
// bit 31 : hyperlink is attached to a shape
@@ -81,8 +81,8 @@ enum PPTExOleObjEntryType
struct PPTExOleObjEntry
{
- PPTExOleObjEntryType const eType;
- sal_uInt32 const nOfsA; ///< offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation)
+ PPTExOleObjEntryType eType;
+ sal_uInt32 nOfsA; ///< offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation)
sal_uInt32 nOfsB; ///< offset to the EPP_ExOleObjStg
css::uno::Reference< css::awt::XControlModel > xControlModel;
@@ -112,7 +112,7 @@ public:
struct CellBorder;
class PPTWriter final : public PPTWriterBase, public PPTExBulletProvider
{
- sal_uInt32 const mnCnvrtFlags;
+ sal_uInt32 mnCnvrtFlags;
bool mbStatus;
sal_uInt32 mnStatMaxValue;
sal_uInt32 mnLatestStatValue;
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index d04bafb81c20..3a469e7b0611 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -79,7 +79,7 @@ enum class EppLayout
struct PHLayout
{
EppLayout nLayout;
- sal_uInt8 nPlaceHolder[ 8 ];
+ sal_uInt8 nPlaceHolder[ 8 ];
sal_uInt8 nUsedObjectPlaceHolder;
sal_uInt8 nTypeOfTitle;
@@ -148,7 +148,7 @@ struct FontCollectionEntry
sal_Int16 Pitch;
sal_Int16 CharSet;
- OUString const Original;
+ OUString Original;
FontCollectionEntry( const OUString& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) :
Scaling ( 1.0 ),
@@ -345,9 +345,9 @@ protected:
sal_uInt32 mnPages; ///< number of Slides ( w/o master pages & notes & handout )
sal_uInt32 mnMasterPages;
- Fraction const maFraction;
- MapMode const maMapModeSrc;
- MapMode const maMapModeDest;
+ Fraction maFraction;
+ MapMode maMapModeSrc;
+ MapMode maMapModeDest;
css::awt::Size maDestPageSize;
css::awt::Size maPageSize; // #i121183# Keep size in logic coordinates (100th mm)
css::awt::Size maNotesPageSize;
diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx
index 55ada15931ac..a104cd4a7eb3 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.hxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.hxx
@@ -35,7 +35,7 @@ namespace ppt
class ExSoundEntry
{
sal_uInt32 nFileSize;
- OUString const aSoundURL;
+ OUString aSoundURL;
OUString ImplGetName() const;
OUString ImplGetExtension() const;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index a3699f8fe81f..f192dadac1e1 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -151,7 +151,7 @@ enum PPTXLayout
struct PPTXLayoutInfo
{
- int const nType;
+ int nType;
const char* sName;
const char* sType;
};
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 7a66fdad4f2c..c81a528a0c66 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -80,7 +80,7 @@ class HtmlExport final
std::vector< SdPage* > maPages;
std::vector< SdPage* > maNotesPages;
- OUString const maPath;
+ OUString maPath;
SdDrawDocument* mpDoc;
::sd::DrawDocShell* mpDocSh;
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index 950623bda5e3..a177c443da3c 100644
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -67,7 +67,7 @@ private:
Atom( const DffRecordHeader& rRecordHeader, SvStream& rStCtrl );
SvStream& mrStream;
- DffRecordHeader const maRecordHeader;
+ DffRecordHeader maRecordHeader;
Atom* mpFirstChild;
Atom* mpNextAtom;
};
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index b9015ddb4c58..5ed596de1b26 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -104,7 +104,7 @@ private:
std::map< sal_uInt16, OUString > maPropertyValues;
VclPtr<ListBox> mpControl;
DECL_LINK(OnSelect, ListBox&, void);
- Link<LinkParamNone*,void> const maModifyLink;
+ Link<LinkParamNone*,void> maModifyLink;
};
}
@@ -276,7 +276,7 @@ public:
private:
VclPtr<SvxColorListBox> mpControl;
DECL_LINK(OnSelect, SvxColorListBox&, void);
- Link<LinkParamNone*,void> const maModifyLink;
+ Link<LinkParamNone*,void> maModifyLink;
};
}
@@ -397,7 +397,7 @@ public:
private:
VclPtr<FontNameBox> mpControl;
- Link<LinkParamNone*,void> const maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
DECL_LINK(ControlSelectHdl, ComboBox&, void);
};
@@ -655,7 +655,7 @@ private:
VclPtr<DropdownMenuBox> mpControl;
VclPtr<PopupMenu> mpMenu;
VclPtr<MetricField> mpMetric;
- Link<LinkParamNone*,void> const maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
};
}
@@ -806,7 +806,7 @@ private:
VclPtr<DropdownMenuBox> mpControl;
VclPtr<PopupMenu> mpMenu;
VclPtr<MetricField> mpMetric;
- Link<LinkParamNone*,void> const maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
};
}
@@ -999,7 +999,7 @@ private:
VclPtr<DropdownMenuBox> mpControl;
VclPtr<PopupMenu> mpMenu;
VclPtr<MetricField> mpMetric;
- Link<LinkParamNone*,void> const maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
};
}
@@ -1400,7 +1400,7 @@ public:
void updateMenu();
private:
- Link<LinkParamNone*,void> const maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
int mnDirection;
std::unique_ptr<weld::MetricSpinButton> mxMetric;
@@ -1569,7 +1569,7 @@ private:
VclPtr<DropdownMenuBox> mpControl;
VclPtr<PopupMenu> mpMenu;
VclPtr<Edit> mpEdit;
- Link<LinkParamNone*,void> const maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
float mfFontWeight;
awt::FontSlant meFontSlant;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index d8b4096b7399..46c81789deeb 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -110,7 +110,7 @@ public:
sal_Int32 getControlType() const { return mnType; }
private:
- sal_Int32 const mnType;
+ sal_Int32 mnType;
};
class SdPropertySubControl
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index d312cebef4e9..4793d8aafcca 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -227,9 +227,9 @@ public:
const SvViewDataEntry* pView,const SvTreeListEntry& rEntry) override;
private:
VclPtr<CustomAnimationList> mpParent;
- OUString const msDescription;
+ OUString msDescription;
OUString msEffectName;
- CustomAnimationEffectPtr const mpEffect;
+ CustomAnimationEffectPtr mpEffect;
static const long nIconWidth = 19;
static const long nItemMinHeight = 38;
};
@@ -362,7 +362,7 @@ public:
const CustomAnimationEffectPtr& getEffect() const { return mpEffect; }
private:
- CustomAnimationEffectPtr const mpEffect;
+ CustomAnimationEffectPtr mpEffect;
};
}
@@ -389,7 +389,7 @@ public:
const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
private:
- OUString const msDescription;
+ OUString msDescription;
static const long nIconWidth = 19;
};
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 05a64f0e01f1..f40c5ad1f849 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -272,7 +272,7 @@ struct lcl_EqualsSoundFileName
}
private:
- OUString const maStr;
+ OUString maStr;
};
// returns -1 if no object was found
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 3021c6616796..60c77e0d0890 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -72,7 +72,7 @@ namespace {
class PathDragMove : public SdrDragMove
{
private:
- basegfx::B2DPolyPolygon const maPathPolyPolygon;
+ basegfx::B2DPolyPolygon maPathPolyPolygon;
protected:
virtual void createSdrDragEntries() override;
@@ -139,7 +139,7 @@ namespace {
class PathDragResize : public SdrDragResize
{
private:
- basegfx::B2DPolyPolygon const maPathPolyPolygon;
+ basegfx::B2DPolyPolygon maPathPolyPolygon;
protected:
virtual void createSdrDragEntries() override;
@@ -202,7 +202,7 @@ namespace {
class PathDragObjOwn : public SdrDragObjOwn
{
private:
- basegfx::B2DPolyPolygon const maPathPolyPolygon;
+ basegfx::B2DPolyPolygon maPathPolyPolygon;
protected:
virtual void createSdrDragEntries() override;
@@ -264,7 +264,7 @@ public:
virtual bool IsFocusHdl() const override;
private:
- SdrPathObj* const mpPathObj;
+ SdrPathObj* mpPathObj;
};
}
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 65dabdc50bbc..f294db977177 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -75,8 +75,8 @@ private:
AnnotationManagerImpl& mrManager;
css::uno::Reference< css::office::XAnnotation > mxAnnotation;
VclPtr<AnnotationWindow> mpAnnotationWindow;
- Color const maColor;
- int const mnIndex;
+ Color maColor;
+ int mnIndex;
const vcl::Font& mrFont;
Size maSize;
ImplSVEvent * mnClosePopupEvent;
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index d069aa541528..d6531c38a285 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -77,7 +77,7 @@ class AnnotationWindow : public FloatingWindow
std::unique_ptr<::Outliner> mpOutliner;
VclPtr<ScrollBar> mpVScrollbar;
css::uno::Reference< css::office::XAnnotation > mxAnnotation;
- bool const mbReadonly;
+ bool mbReadonly;
bool mbProtected;
bool mbMouseOverButton;
VclPtr<AnnotationTextWindow> mpTextWindow;
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index 1513e543fbb9..39c8b7ed58f4 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -72,7 +72,7 @@ private:
struct snewfoil_value_info
{
- sal_uInt16 const mnId;
+ sal_uInt16 mnId;
const char* msBmpResId;
const char* mpStrResId;
const char* msUnoCommand;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 3652b74da289..6cfc26eb5eb3 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -79,7 +79,7 @@ struct snewfoil_value_info_layout
{
const char* msBmpResId;
const char* mpStrResId;
- AutoLayout const maAutoLayout;
+ AutoLayout maAutoLayout;
};
}
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index a467795a9331..96fe84698d0f 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -49,8 +49,8 @@ public:
msContentIdentifier(rsContentIdentifier),
mxFolderEnvironment(rxFolderEnvironment)
{ }
- int const mnPriority;
- OUString const msContentIdentifier;
+ int mnPriority;
+ OUString msContentIdentifier;
// Reference<sdbc::XResultSet> mxFolderResultSet;
Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment;
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b53d25c72946..d912ca226204 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -90,8 +90,8 @@ const int nDateTimeFormatsCount = 12;
namespace {
struct DateAndTimeFormat {
- SvxDateFormat const meDateFormat;
- SvxTimeFormat const meTimeFormat;
+ SvxDateFormat meDateFormat;
+ SvxTimeFormat meTimeFormat;
};
}
@@ -120,7 +120,7 @@ class HeaderFooterTabPage
private:
SdDrawDocument* mpDoc;
LanguageType meOldLanguage;
- bool const mbHandoutMode;
+ bool mbHandoutMode;
std::unique_ptr<weld::Builder> mxBuilder;
std::unique_ptr<weld::Container> mxContainer;
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index b9b54235518b..b9d4edfc01db 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -85,7 +85,7 @@ public:
const css::lang::EventObject& rEvent) override;
private:
- sal_uInt16 const mnChildWindowId;
+ sal_uInt16 mnChildWindowId;
ViewShellBase& mrViewShellBase;
::std::unique_ptr<SfxShell> mpShell;
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index eb870559f236..9a1ab0b05090 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -97,10 +97,10 @@ public:
virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) override;
private:
- OUString const msEventType;
+ OUString msEventType;
Reference<XConfigurationController> mxConfigurationController;
- ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter const maFilter;
- ::sd::framework::FrameworkHelper::Callback const maCallback;
+ ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter maFilter;
+ ::sd::framework::FrameworkHelper::Callback maCallback;
};
//----- LifetimeController ----------------------------------------------------
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index fd8b42f7161f..9b3294fcab8f 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -126,7 +126,7 @@ private:
virtual void
implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override;
- ::sd::ViewShell* const mpSdViewSh;
+ ::sd::ViewShell* mpSdViewSh;
/** This object manages the shapes of the represented draw page. It is
responsible to determine the visible shapes and create on demand the
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 17ad513fe782..7ad8015b685c 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -168,7 +168,7 @@ public:
private:
css::uno::Reference<css::accessibility::XAccessible> mxParent;
- sal_uInt16 const mnPageNumber;
+ sal_uInt16 mnPageNumber;
::sd::slidesorter::SlideSorter& mrSlideSorter;
sal_uInt32 mnClientId;
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 4172f17b4b77..6dc085331054 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -82,7 +82,7 @@ public:
virtual Size LogicToPixel (const Size& rSize) const override;
private:
- SdrPaintView* const mpView;
+ SdrPaintView* mpView;
sal_uInt16 mnWindowId;
AccessibleViewForwarder (AccessibleViewForwarder const &) = delete;
diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx
index a83f7043ac68..408ccd989a9c 100644
--- a/sd/source/ui/inc/Client.hxx
+++ b/sd/source/ui/inc/Client.hxx
@@ -29,7 +29,7 @@ class ViewShell;
class Client : public SfxInPlaceClient
{
- ViewShell* const mpViewShell;
+ ViewShell* mpViewShell;
SdrOle2Obj* pSdrOle2Obj;
virtual void ObjectAreaChanged() override;
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 2c5ef9c46cdb..cb89e22bd446 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -212,12 +212,12 @@ protected:
::sd::ViewShell* mpViewShell;
std::unique_ptr<FontList> mpFontList;
rtl::Reference<FuPoor> mxDocShellFunction;
- DocumentType const meDocType;
+ DocumentType meDocType;
SfxStyleFamily mnStyleFamily;
o3tl::span<sal_uInt16 const>
mpFilterSIDs;
bool mbFilterEnable;
- bool const mbSdDataObj;
+ bool mbSdDataObj;
bool mbInDestruction;
bool mbOwnPrinter;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index caffc7b0363a..f1578bed321b 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -120,7 +120,7 @@ namespace sd { namespace tools {
class EventMultiplexerEvent
{
public:
- EventMultiplexerEventId const meEventId;
+ EventMultiplexerEventId meEventId;
const void* mpUserData;
EventMultiplexerEvent (
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 927cfbf4cda4..ae8267f30b40 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -104,7 +104,7 @@ public:
ET_MASTER_PAGE_REMOVED
};
- EventType const meType;
+ EventType meType;
const OUString& mrMasterPageName;
MasterPageObserverEvent (
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 4742f67f5bb3..b32f72398873 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -201,7 +201,7 @@ private:
/** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */
std::unique_ptr<OutlineViewModelChangeGuard, o3tl::default_delete<OutlineViewModelChangeGuard>> maDragAndDropModelGuard;
- SvxLRSpaceItem const maLRSpaceItem;
+ SvxLRSpaceItem maLRSpaceItem;
Image maSlideImage;
};
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 0258eaada128..300f7d7da068 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -33,9 +33,9 @@ namespace sd
struct ClientInfo
{
- OUString const mName;
+ OUString mName;
- bool const mbIsAlreadyAuthorised;
+ bool mbIsAlreadyAuthorised;
ClientInfo( const OUString& rName,
const bool bIsAlreadyAuthorised ) :
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index 1b506b39bb48..702a177bf182 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -100,7 +100,7 @@ private:
DECL_LINK(LateInitCallback, Timer *, void);
ViewShellBase & mrBase;
- SdDrawDocument * const mpDrawDoc;
+ SdDrawDocument * mpDrawDoc;
std::unique_ptr<TransitionPane> mxVS_TRANSITION_ICONS;
std::unique_ptr<weld::CustomWeld> mxVS_TRANSITION_ICONSWin;
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 4a73c6d09842..405070f0c0ce 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -47,8 +47,8 @@ public:
TemplateEntry (const OUString& rsTitle, const OUString& rsPath)
: msTitle(rsTitle), msPath(rsPath) {}
- OUString const msTitle;
- OUString const msPath;
+ OUString msTitle;
+ OUString msPath;
};
/** This class scans the template folders for impress templates. There are
diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx
index 574982dcda50..dbbd3d3d0d03 100644
--- a/sd/source/ui/inc/ViewShellHint.hxx
+++ b/sd/source/ui/inc/ViewShellHint.hxx
@@ -50,7 +50,7 @@ public:
HintId GetHintId() const { return meHintId;}
private:
- HintId const meHintId;
+ HintId meHintId;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 716353b6b535..e6a114c15fcb 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -43,8 +43,8 @@ public:
private:
const SfxItemSet& mrOutAttrs;
- Fraction const maUIScale;
- ::sd::View* const mpView;
+ Fraction maUIScale;
+ ::sd::View* mpView;
std::unique_ptr<weld::SpinButton> m_xNumFldCopies;
std::unique_ptr<weld::Button> m_xBtnSetViewData;
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index 238c9737c15a..0b5ebede9542 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -38,7 +38,7 @@ class SdSnapLineDlg : public weld::GenericDialogController
private:
int nXValue;
int nYValue;
- Fraction const aUIScale;
+ Fraction aUIScale;
std::unique_ptr<weld::Label> m_xFtX;
std::unique_ptr<weld::MetricSpinButton> m_xMtrFldX;
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 18b2eeccec3a..3699c1ac431d 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -137,7 +137,7 @@ private:
css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster>
mxBroadcaster;
- bool const mbBroadcastRequestEvents;
+ bool mbBroadcastRequestEvents;
/** This private variant of the constructor is used for cloning a
Configuration object.
diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx
index b91b85da72dd..2f599fa7fd07 100644
--- a/sd/source/ui/inc/fuinsert.hxx
+++ b/sd/source/ui/inc/fuinsert.hxx
@@ -44,7 +44,7 @@ private:
SfxRequest& rReq,
bool replaceExistingImage);
- bool const mbReplaceExistingImage;
+ bool mbReplaceExistingImage;
};
/************************************************************************/
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index 8c96a47821b6..daad42cf1e63 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -29,7 +29,7 @@ class SfxMedium;
class SdInsertPagesObjsDlg : public weld::GenericDialogController
{
private:
- SfxMedium* const m_pMedium;
+ SfxMedium* m_pMedium;
const SdDrawDocument* m_pDoc;
const OUString& m_rName;
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index ef7913b344db..2f4e6a967879 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -45,7 +45,7 @@ private:
XDashListRef pDashList;
XLineEndListRef pLineEndList;
- PresentationObjects const ePO;
+ PresentationObjects ePO;
virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 0e40bd0618b2..b142291e7124 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -132,7 +132,7 @@ private:
bool mbInternalMove : 1;
bool mbOwnDocument : 1;
bool mbOwnView : 1;
- bool const mbLateInit : 1;
+ bool mbLateInit : 1;
bool mbPageTransferable : 1;
bool mbPageTransferablePersistent : 1;
::std::vector<std::shared_ptr<UserData> > maUserData;
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 588e6e20b23f..6b23e0568a28 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -190,7 +190,7 @@ private:
SlideShow(const SlideShow&) = delete;
SlideShow& operator=( const SlideShow& ) = delete;
- SvxItemPropertySet const maPropSet;
+ SvxItemPropertySet maPropSet;
rtl::Reference< SlideshowImpl > mxController;
/** This flag is used together with mxController.is() to prevent
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index bbce06878ac4..a1117b8f33f9 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -161,7 +161,7 @@ public:
const SmartTagReference& getTag() const { return mxSmartTag; }
private:
- SmartTagReference const mxSmartTag;
+ SmartTagReference mxSmartTag;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx
index cd7d92c629d3..32019481f05b 100644
--- a/sd/source/ui/inc/tabtempl.hxx
+++ b/sd/source/ui/inc/tabtempl.hxx
@@ -34,15 +34,15 @@ class SdTabTemplateDlg : public SfxStyleDialogController
{
private:
const SfxObjectShell& rDocShell;
- SdrView* const pSdrView;
-
- XColorListRef const pColorList;
- XGradientListRef const pGradientList;
- XHatchListRef const pHatchingList;
- XBitmapListRef const pBitmapList;
- XPatternListRef const pPatternList;
- XDashListRef const pDashList;
- XLineEndListRef const pLineEndList;
+ SdrView* pSdrView;
+
+ XColorListRef pColorList;
+ XGradientListRef pGradientList;
+ XHatchListRef pHatchingList;
+ XBitmapListRef pBitmapList;
+ XPatternListRef pPatternList;
+ XDashListRef pDashList;
+ XLineEndListRef pLineEndList;
virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
virtual void RefreshInputSet() override;
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index e96aa05e3675..95dedec19a15 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -71,7 +71,7 @@ private:
object when its task has been executed completely.
*/
std::shared_ptr<TimerBasedTaskExecution> mpSelf;
- sal_uInt32 const mnMaxTimePerStep;
+ sal_uInt32 mnMaxTimePerStep;
TimerBasedTaskExecution (
const std::shared_ptr<AsynchronousTask>& rpTask,
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index 6e6b64295def..68f4511d0379 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -39,19 +39,19 @@ public:
virtual void Redo() override;
private:
- SdrLayer* const mpLayer;
- OUString const maOldLayerName;
- OUString const maOldLayerTitle;
- OUString const maOldLayerDesc;
- bool const mbOldIsVisible;
- bool const mbOldIsLocked;
- bool const mbOldIsPrintable;
- OUString const maNewLayerName;
- OUString const maNewLayerTitle;
- OUString const maNewLayerDesc;
- bool const mbNewIsVisible;
- bool const mbNewIsLocked;
- bool const mbNewIsPrintable;
+ SdrLayer* mpLayer;
+ OUString maOldLayerName;
+ OUString maOldLayerTitle;
+ OUString maOldLayerDesc;
+ bool mbOldIsVisible;
+ bool mbOldIsLocked;
+ bool mbOldIsPrintable;
+ OUString maNewLayerName;
+ OUString maNewLayerTitle;
+ OUString maNewLayerDesc;
+ bool mbNewIsVisible;
+ bool mbNewIsLocked;
+ bool mbNewIsPrintable;
};
#endif // INCLUDED_SD_SOURCE_UI_INC_UNDOLAYER_HXX
diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx
index 8872059de6b5..0e3f52e48e04 100644
--- a/sd/source/ui/inc/undopage.hxx
+++ b/sd/source/ui/inc/undopage.hxx
@@ -34,24 +34,24 @@ class SdPageFormatUndoAction : public SdUndoAction
{
SdPage* mpPage;
- Size const maOldSize;
- sal_Int32 const mnOldLeft;
- sal_Int32 const mnOldRight;
- sal_Int32 const mnOldUpper;
- sal_Int32 const mnOldLower;
- Orientation const meOldOrientation;
- sal_uInt16 const mnOldPaperBin;
- bool const mbOldFullSize;
-
- Size const maNewSize;
- sal_Int32 const mnNewLeft;
- sal_Int32 const mnNewRight;
- sal_Int32 const mnNewUpper;
- sal_Int32 const mnNewLower;
- bool const mbNewScale;
- Orientation const meNewOrientation;
- sal_uInt16 const mnNewPaperBin;
- bool const mbNewFullSize;
+ Size maOldSize;
+ sal_Int32 mnOldLeft;
+ sal_Int32 mnOldRight;
+ sal_Int32 mnOldUpper;
+ sal_Int32 mnOldLower;
+ Orientation meOldOrientation;
+ sal_uInt16 mnOldPaperBin;
+ bool mbOldFullSize;
+
+ Size maNewSize;
+ sal_Int32 mnNewLeft;
+ sal_Int32 mnNewRight;
+ sal_Int32 mnNewUpper;
+ sal_Int32 mnNewLower;
+ bool mbNewScale;
+ Orientation meNewOrientation;
+ sal_uInt16 mnNewPaperBin;
+ bool mbNewFullSize;
public:
SdPageFormatUndoAction( SdDrawDocument* pDoc,
@@ -109,10 +109,10 @@ class SdPageLRUndoAction : public SdUndoAction
{
SdPage* mpPage;
- sal_Int32 const mnOldLeft;
- sal_Int32 const mnOldRight;
- sal_Int32 const mnNewLeft;
- sal_Int32 const mnNewRight;
+ sal_Int32 mnOldLeft;
+ sal_Int32 mnOldRight;
+ sal_Int32 mnNewLeft;
+ sal_Int32 mnNewRight;
public:
SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage,
@@ -137,10 +137,10 @@ class SdPageULUndoAction : public SdUndoAction
{
SdPage* mpPage;
- sal_Int32 const mnOldUpper;
- sal_Int32 const mnOldLower;
- sal_Int32 const mnNewUpper;
- sal_Int32 const mnNewLower;
+ sal_Int32 mnOldUpper;
+ sal_Int32 mnOldLower;
+ sal_Int32 mnNewUpper;
+ sal_Int32 mnNewLower;
public:
SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage,
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index c327c937ca34..2e04e7c4e1aa 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -68,7 +68,7 @@ public:
private:
OUString maOldName;
- OUString const maNewName;
+ OUString maNewName;
const OUString maComment;
};
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index 900d9e77f412..944deeca8476 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -67,7 +67,7 @@ class SdAnimationPrmsUndoAction : public SdUndoAction
sal_uInt16 nOldVerb;
sal_uInt16 nNewVerb;
- bool const bInfoCreated;
+ bool bInfoCreated;
public:
SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj,
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index da209c5db1c8..4d4279bff245 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -41,7 +41,7 @@ class SdUnoSearchReplaceDescriptor;
class SdUnoSearchReplaceShape : public css::util::XReplaceable
{
protected:
- css::drawing::XDrawPage* const mpPage;
+ css::drawing::XDrawPage* mpPage;
css::uno::Reference< css::text::XTextRange > Search( const css::uno::Reference< css::text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr );
bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw();
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index f5977e52d863..1bbcec397ad5 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -35,8 +35,8 @@ class DrawDocShell;
class SdVectorizeDlg : public weld::GenericDialogController
{
- ::sd::DrawDocShell* const m_pDocSh;
- Bitmap const aBmp;
+ ::sd::DrawDocShell* m_pDocSh;
+ Bitmap aBmp;
Bitmap aPreviewBmp;
GDIMetaFile aMtf;
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
index 775f3b85f001..2cbc77776756 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
@@ -57,7 +57,7 @@ namespace sd
sal_Int32 aRet, aRead;
std::vector<char> aBuffer;
int mSocket;
- bool const usingCSocket;
+ bool usingCSocket;
};
}
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 1828b72960b5..840784d538eb 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -51,8 +51,8 @@ namespace sd {
struct ClientInfoInternal:
ClientInfo
{
- BufferedStreamSocket * const mpStreamSocket;
- OUString const mPin;
+ BufferedStreamSocket *mpStreamSocket;
+ OUString mPin;
ClientInfoInternal( const OUString& rName,
BufferedStreamSocket *pSocket,
diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx
index e415e3f646a9..a595d0b58bf1 100644
--- a/sd/source/ui/remotecontrol/ZeroconfService.hxx
+++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx
@@ -29,7 +29,7 @@ namespace sd{
{
protected:
std::string name;
- uint const port;
+ uint port;
public:
explicit ZeroconfService(const std::string& aname, uint aport)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 2b12aa17f34e..ab28d88df7ab 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -74,8 +74,8 @@ struct snewfoil_value_info
{
const char* msBmpResId;
const char* mpStrResId;
- WritingMode const meWritingMode;
- AutoLayout const maAutoLayout;
+ WritingMode meWritingMode;
+ AutoLayout maAutoLayout;
};
}
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
index 9ca123b1af0c..da480cb1ac10 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
@@ -116,7 +116,7 @@ public:
virtual SdPage* operator () (SdDrawDocument* pDocument) override;
virtual int GetCostIndex() override;
private:
- OUString const msURL;
+ OUString msURL;
SfxObjectShellLock mxDocumentShell;
::sd::DrawDocShell* LoadDocument (const OUString& sFileName);
};
@@ -133,7 +133,7 @@ public:
virtual int GetCostIndex() override;
virtual bool NeedsPageObject() override;
private:
- OUString const msURL;
+ OUString msURL;
};
/** Create an empty default master page.
@@ -158,7 +158,7 @@ public:
virtual SdPage* operator() (SdDrawDocument* pDocument) override;
virtual int GetCostIndex() override;
private:
- SdPage* const mpPage;
+ SdPage* mpPage;
};
} } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 49a88612f672..417702dd909d 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -41,8 +41,8 @@ public:
: mpDescriptor(rpDescriptor),
mnPriority(nPriority)
{}
- SharedMasterPageDescriptor const mpDescriptor;
- int const mnPriority;
+ SharedMasterPageDescriptor mpDescriptor;
+ int mnPriority;
class Compare
{
public:
@@ -64,7 +64,7 @@ public:
class CompareToken
{
public:
- MasterPageContainer::Token const maToken;
+ MasterPageContainer::Token maToken;
explicit CompareToken(MasterPageContainer::Token aToken) : maToken(aToken) {}
bool operator() (const PreviewCreationRequest& rRequest) const
{ return maToken==rRequest.mpDescriptor->maToken; }
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index e65c2891ffaf..5e3d9840b38f 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -79,7 +79,7 @@ public:
void ProcessAllRequests();
private:
- std::weak_ptr<ContainerAdapter> const mpWeakContainer;
+ std::weak_ptr<ContainerAdapter> mpWeakContainer;
class PreviewCreationRequest;
class RequestQueue;
std::unique_ptr<RequestQueue> mpRequestQueue;
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index c20ced5b8a21..3881a0af8337 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -204,12 +204,12 @@ public:
sal_Int32 mnUseCount;
class URLComparator { public:
- OUString const msURL;
+ OUString msURL;
explicit URLComparator (const OUString& sURL);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class StyleNameComparator { public:
- OUString const msStyleName;
+ OUString msStyleName;
explicit StyleNameComparator (const OUString& sStyleName);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
@@ -222,7 +222,7 @@ public:
explicit AllComparator(const SharedMasterPageDescriptor& rDescriptor);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
private:
- SharedMasterPageDescriptor const mpDescriptor;
+ SharedMasterPageDescriptor mpDescriptor;
};
};
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index ac3b4478d63e..ec98cc1f3147 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -71,7 +71,7 @@ private:
{ return maToken==rDescriptor.maToken; }
private:
- ::sd::sidebar::MasterPageContainer::Token const maToken;
+ ::sd::sidebar::MasterPageContainer::Token maToken;
};
};
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 7c2291e857a5..c3464cd84b66 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -118,12 +118,12 @@ private:
css::uno::Reference<css::frame::XFrame> mxFrame;
vcl::EnumContext maContext;
- vcl::EnumContext const maDrawOtherContext;
- vcl::EnumContext const maDrawMasterContext;
- vcl::EnumContext const maImpressOtherContext;
- vcl::EnumContext const maImpressMasterContext;
- vcl::EnumContext const maImpressHandoutContext;
- vcl::EnumContext const maImpressNotesContext;
+ vcl::EnumContext maDrawOtherContext;
+ vcl::EnumContext maDrawMasterContext;
+ vcl::EnumContext maImpressOtherContext;
+ vcl::EnumContext maImpressMasterContext;
+ vcl::EnumContext maImpressHandoutContext;
+ vcl::EnumContext maImpressNotesContext;
bool mbTitle;
std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem;
std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem;
@@ -134,7 +134,7 @@ private:
FieldUnit meFUnit;
OUString maCustomEntry;
- SfxBindings* const mpBindings;
+ SfxBindings* mpBindings;
MapUnit meUnit;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 74abf278ffc1..e92bb0b509ce 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -168,7 +168,7 @@ private:
bool isValidSlideNumber( sal_Int32 nSlideNumber ) const { return (nSlideNumber >= 0) && (nSlideNumber < mnSlideCount); }
private:
- Mode const meMode;
+ Mode meMode;
sal_Int32 mnStartSlideNumber;
std::vector< sal_Int32 > maSlideNumbers;
std::vector< bool > maSlideVisible;
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 7c559fa4f403..602f2e025532 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -213,11 +213,11 @@ private:
mpMouseListeners;
::std::unique_ptr< SlideShowViewMouseMotionListeners >
mpMouseMotionListeners;
- SdDrawDocument* const mpDoc;
+ SdDrawDocument* mpDoc;
bool mbIsMouseMotionListener;
- AnimationMode const meAnimationMode;
+ AnimationMode meAnimationMode;
bool mbFirstPaint;
- bool const mbFullScreen;
+ bool mbFullScreen;
bool mbMousePressedEaten;
css::geometry::IntegerSize2D mTranslationOffset;
};
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index 0e6042d92085..da5a440dd882 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -35,7 +35,7 @@ class NoBitmapCompression::DummyReplacement
: public BitmapReplacement
{
public:
- BitmapEx const maPreview;
+ BitmapEx maPreview;
explicit DummyReplacement (const BitmapEx& rPreview) : maPreview(rPreview) { }
virtual ~DummyReplacement() {}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
index 8babf5ebb3e0..bccb196c2d78 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
@@ -63,7 +63,7 @@ public:
protected:
BitmapCache& mrCache;
- sal_Int32 const mnMaximalCacheSize;
+ sal_Int32 mnMaximalCacheSize;
CacheCompactor(
BitmapCache& rCache,
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 37755bc14cb5..45afd93c96f3 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -34,7 +34,7 @@ class CacheDescriptor
{
public:
::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument;
- Size const maPreviewSize;
+ Size maPreviewSize;
CacheDescriptor(
::sd::slidesorter::cache::PageCacheManager::DocumentKey const & pDocument,
@@ -98,7 +98,7 @@ public:
}
private:
- Size const maPreferredSize;
+ Size maPreferredSize;
};
} // end of anonymous namespace
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index afc418d92c35..a1fb53b2975e 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -75,9 +75,9 @@ public:
const CacheKey maKey;
};
- CacheKey const maKey;
- sal_Int32 const mnPriorityInClass;
- RequestPriorityClass const meClass;
+ CacheKey maKey;
+ sal_Int32 mnPriorityInClass;
+ RequestPriorityClass meClass;
};
}
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 044efe5ee461..e79112d06743 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -47,8 +47,8 @@ public:
void Expire();
bool IsExpired() const { return mbIsExpired;}
- Animator::AnimationFunctor const maAnimation;
- Animator::FinishFunctor const maFinishFunctor;
+ Animator::AnimationFunctor maAnimation;
+ Animator::FinishFunctor maFinishFunctor;
const Animator::AnimationId mnAnimationId;
const double mnDuration;
const double mnEnd;
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 5ed5359e8655..932f8e6da24f 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -93,12 +93,12 @@ namespace sd::slidesorter::controller {
class SelectionFunction::EventDescriptor
{
public:
- Point const maMousePosition;
+ Point maMousePosition;
Point maMouseModelPosition;
model::SharedPageDescriptor mpHitDescriptor;
SdrPage* mpHitPage;
sal_uInt32 mnEventCode;
- InsertionIndicatorHandler::Mode const meDragMode;
+ InsertionIndicatorHandler::Mode meDragMode;
bool mbIsLeaving;
EventDescriptor (
@@ -239,7 +239,7 @@ protected:
private:
SelectionMode meSelectionMode;
Point maSecondCorner;
- PointerStyle const maSavedPointer;
+ PointerStyle maSavedPointer;
bool mbAutoScrollInstalled;
sal_Int32 mnAnchorIndex;
sal_Int32 mnSecondIndex;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 18c2bbe44c0e..20e1f747eb29 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -94,7 +94,7 @@ private:
class Animation;
typedef ::std::vector<std::shared_ptr<Animation> > AnimationList;
AnimationList maAnimations;
- ::canvas::tools::ElapsedTime const maElapsedTime;
+ ::canvas::tools::ElapsedTime maElapsedTime;
std::unique_ptr<view::SlideSorterView::DrawLock, o3tl::default_delete<view::SlideSorterView::DrawLock>> mpDrawLock;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index 0455206ebfcc..692caa781ded 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -160,7 +160,7 @@ public:
FocusHider (FocusManager&);
~FocusHider() COVERITY_NOEXCEPT_FALSE;
private:
- bool const mbFocusVisible;
+ bool mbFocusVisible;
FocusManager& mrManager;
};
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 9073e2cfe329..1ab15496a5f4 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -178,7 +178,7 @@ private:
/** The width and height of the border at the inside of the window which
when entered while in drag mode leads to a scrolling of the window.
*/
- Size const maScrollBorder;
+ Size maScrollBorder;
/** The only task of this little window is to paint the little square at
the bottom right corner left by the two scroll bars (when both are
visible).
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index 76a8369a71b3..24e383d68cde 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -47,8 +47,8 @@ public:
Representative (const BitmapEx& rBitmap, const bool bIsExcluded)
: maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {}
- BitmapEx const maBitmap;
- bool const mbIsExcluded;
+ BitmapEx maBitmap;
+ bool mbIsExcluded;
};
static SdTransferable* CreateTransferable (
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 26b61e12e5c2..0794502f1099 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -214,7 +214,7 @@ private:
model::SharedPageDescriptor mpPageUnderMouse;
std::shared_ptr<PageObjectPainter> mpPageObjectPainter;
vcl::Region maRedrawRegion;
- SharedILayerPainter const mpBackgroundPainter;
+ SharedILayerPainter mpBackgroundPainter;
std::unique_ptr<ToolTip, o3tl::default_delete<ToolTip>> mpToolTip;
bool mbIsRearrangePending;
::std::vector<Link<LinkParamNone*,void>> maVisibilityChangeListeners;
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 6eac97c38003..9bdefa2ef522 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -69,14 +69,14 @@ public:
void ResetOffsets (const controller::Animator::AnimationMode eMode);
/// Index of the row or column that this run represents.
- sal_Int32 const mnRunIndex;
+ sal_Int32 mnRunIndex;
/// The index at which to make place for the insertion indicator (-1 for
/// no indicator).
sal_Int32 mnLocalInsertIndex;
/// Index of the first page in the run.
- sal_Int32 const mnStartIndex;
+ sal_Int32 mnStartIndex;
/// Index of the last page in the run.
- sal_Int32 const mnEndIndex;
+ sal_Int32 mnEndIndex;
/// Offset of each item in the run at the start of the current animation.
::std::vector<Point> maStartOffset;
/// Target offset of each item in the run at the end of the current animation.
@@ -96,7 +96,7 @@ public:
private:
controller::Animator::AnimationId mnAnimationId;
AnimatorAccess& mrAnimatorAccess;
- ::std::function<double (double)> const maAccelerationFunction;
+ ::std::function<double (double)> maAccelerationFunction;
void RestartAnimation();
};
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index a566b3c8adb2..b4c6dfd428e0 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -41,9 +41,9 @@ public:
sal_Int32 mnBottomBorder;
static const sal_Int32 gnVerticalGap = 10 - 2*Theme_FocusIndicatorWidth;
static const sal_Int32 gnHorizontalGap = 10 - 2*Theme_FocusIndicatorWidth;
- Size const maMinimalSize;
- Size const maPreferredSize;
- Size const maMaximalSize;
+ Size maMinimalSize;
+ Size maPreferredSize;
+ Size maMaximalSize;
sal_Int32 mnMinimalColumnCount;
sal_Int32 mnMaximalColumnCount;
sal_Int32 mnPageCount;
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 7ed95bb185df..69a4729d9818 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -48,7 +48,7 @@ private:
/// SfxInterface initializer.
static void InitInterface_Impl();
- ::sd::View* const mpView;
+ ::sd::View* mpView;
::sd::ViewShell* mpViewSh;
};
diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx
index e1bb16b8dd1c..e3215ab35af2 100644
--- a/sd/source/ui/uitest/uiobject.cxx
+++ b/sd/source/ui/uitest/uiobject.cxx
@@ -28,7 +28,7 @@ public:
private:
VclPtr<sd::Window> mxWindow;
- OUString const maName;
+ OUString maName;
};
sd::DrawViewShell* getViewShell(const VclPtr<sd::Window>& xWindow)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b06e341a6879..54c3658183fa 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1494,8 +1494,8 @@ namespace {
class ImplRenderPaintProc : public sdr::contact::ViewObjectContactRedirector
{
const SdrLayerAdmin& rLayerAdmin;
- SdrPageView* const pSdrPageView;
- vcl::PDFExtOutDevData* const pPDFExtOutDevData;
+ SdrPageView* pSdrPageView;
+ vcl::PDFExtOutDevData* pPDFExtOutDevData;
vcl::PDFWriter::StructElement ImplBegStructureTag( SdrObject& rObject );
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index d87821f8c677..6d71dd5bcf08 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1029,7 +1029,7 @@ uno::Any SdXShape::GetStyleSheet() const
class SdUnoEventsAccess : public cppu::WeakImplHelper< css::container::XNameReplace, css::lang::XServiceInfo >
{
private:
- SdXShape* const mpShape;
+ SdXShape* mpShape;
public:
explicit SdUnoEventsAccess(SdXShape* pShape) throw();
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 70651b81b51b..bb59ccda6b1b 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -367,8 +367,8 @@ namespace {
ViewShellBase &mrBase;
std::vector<beans::PropertyValue> maProperties;
std::vector<sal_Int32> maSlidesPerPage;
- bool const mbImpress;
- sal_Int32 const mnCurPage;
+ bool mbImpress;
+ sal_Int32 mnCurPage;
void ProcessResource()
{
@@ -1336,7 +1336,7 @@ public:
private:
// rhbz#657394: keep the document alive: prevents crash when
- SfxObjectShellRef const mxObjectShell; // destroying mpPrintView
+ SfxObjectShellRef mxObjectShell; // destroying mpPrintView
ViewShellBase& mrBase;
bool mbIsDisposed;
VclPtr<Printer> mpPrinter;
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index b6cb9ce04ab4..eb9b0ff40a27 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -85,7 +85,7 @@ public:
bool operator() (const ShellDescriptor& rDescriptor)
{ return rDescriptor.mnId == mnId; }
private:
- ShellId const mnId;
+ ShellId mnId;
};
} // end of anonymous namespace
More information about the Libreoffice-commits
mailing list