[Libreoffice-commits] core.git: include/svx svx/inc svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Mar 13 18:22:17 UTC 2020
include/svx/AccessibleShapeInfo.hxx | 2
include/svx/ClassificationField.hxx | 8 -
include/svx/EnhancedCustomShape2d.hxx | 4
include/svx/EnhancedCustomShapeGeometry.hxx | 48 +++----
include/svx/SmartTagMgr.hxx | 2
include/svx/SvxPresetListBox.hxx | 2
include/svx/colorbox.hxx | 2
include/svx/colorwindow.hxx | 10 -
include/svx/compressgraphicdialog.hxx | 6
include/svx/dbaexchange.hxx | 2
include/svx/e3dundo.hxx | 4
include/svx/float3d.hxx | 2
include/svx/fmshell.hxx | 2
include/svx/fmsrcimp.hxx | 2
include/svx/gallery1.hxx | 2
include/svx/galmisc.hxx | 8 -
include/svx/galtheme.hxx | 2
include/svx/graphctl.hxx | 2
include/svx/hdft.hxx | 2
include/svx/langbox.hxx | 2
include/svx/numfmtsh.hxx | 2
include/svx/numinf.hxx | 8 -
include/svx/ofaitem.hxx | 2
include/svx/passwd.hxx | 4
include/svx/ruler.hxx | 2
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 18 +-
include/svx/sdr/overlay/overlaybitmapex.hxx | 12 -
include/svx/sdr/overlay/overlaymanager.hxx | 2
include/svx/sdr/overlay/overlaypolypolygon.hxx | 2
include/svx/sdr/overlay/overlayselection.hxx | 4
include/svx/selctrl.hxx | 2
include/svx/sidebar/LineWidthPopup.hxx | 6
include/svx/svddrgmt.hxx | 10 -
include/svx/svdhdl.hxx | 22 +--
include/svx/svditer.hxx | 2
include/svx/svdlayer.hxx | 2
include/svx/svdmodel.hxx | 2
include/svx/svdobj.hxx | 8 -
include/svx/svdpage.hxx | 4
include/svx/svdpntv.hxx | 2
include/svx/svdtrans.hxx | 4
include/svx/svdundo.hxx | 22 +--
include/svx/svxgrahicitem.hxx | 2
include/svx/tbxcolorupdate.hxx | 4
include/svx/unoshape.hxx | 2
include/svx/xmlexchg.hxx | 2
include/svx/xtable.hxx | 14 +-
include/svx/zoomctrl.hxx | 2
svx/inc/CommonStylePreviewRenderer.hxx | 2
svx/inc/dragmt3d.hxx | 2
svx/inc/palettes.hxx | 10 -
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 4
svx/inc/sdr/overlay/overlayhandle.hxx | 4
svx/inc/sdr/overlay/overlayhelpline.hxx | 2
svx/inc/sdr/overlay/overlayline.hxx | 2
svx/inc/sdr/overlay/overlayrectangle.hxx | 4
svx/inc/sdr/overlay/overlayrollingrectangle.hxx | 4
svx/inc/sdr/overlay/overlaytools.hxx | 62 +++++-----
svx/inc/sdr/overlay/overlaytriangle.hxx | 4
svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx | 8 -
svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx | 4
svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx | 10 -
svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx | 12 -
svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx | 6
svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx | 28 ++--
svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx | 6
svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 4
svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx | 8 -
svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx | 10 -
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 32 ++---
svx/inc/xpolyimp.hxx | 2
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2
svx/source/customshapes/EnhancedCustomShape3d.hxx | 4
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 4
svx/source/customshapes/EnhancedCustomShapeHandle.hxx | 2
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 2
svx/source/dialog/framelinkarray.cxx | 4
svx/source/dialog/srchdlg.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/filtnav.cxx | 4
svx/source/form/fmdocumentclassification.cxx | 4
svx/source/form/fmsrccfg.cxx | 2
svx/source/form/formcontrolling.cxx | 10 -
svx/source/form/tabwin.cxx | 2
svx/source/gallery2/galbrws1.hxx | 2
svx/source/gallery2/galbrws2.cxx | 4
svx/source/inc/AccessibleFrameSelector.hxx | 2
svx/source/inc/charmapacc.hxx | 2
svx/source/inc/datanavi.hxx | 22 +--
svx/source/inc/delayedevent.hxx | 2
svx/source/inc/docrecovery.hxx | 8 -
svx/source/inc/filtnav.hxx | 6
svx/source/inc/fmexpl.hxx | 12 -
svx/source/inc/fmshimp.hxx | 4
svx/source/inc/fmtextcontroldialogs.hxx | 2
svx/source/inc/fmtextcontrolfeature.hxx | 4
svx/source/inc/fmundo.hxx | 8 -
svx/source/inc/formcontrolling.hxx | 2
svx/source/inc/gridcell.hxx | 4
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 4
svx/source/inc/svxrectctaccessiblecontext.hxx | 12 -
svx/source/mnuctrls/smarttagmenu.cxx | 2
svx/source/sdr/attribute/sdrformtextattribute.cxx | 22 +--
svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx | 6
svx/source/sdr/attribute/sdrtextattribute.cxx | 36 ++---
svx/source/sdr/contact/viewobjectcontact.cxx | 4
svx/source/sidebar/area/AreaPropertyPanel.hxx | 2
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 2
svx/source/sidebar/line/LinePropertyPanel.hxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 2
svx/source/stbctrls/pszctrl.cxx | 2
svx/source/svdraw/svddrgm1.hxx | 4
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdfmtf.hxx | 4
svx/source/svdraw/svdhdl.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdopath.cxx | 4
svx/source/svdraw/svdpdf.hxx | 6
svx/source/svdraw/svdsnpv.cxx | 6
svx/source/table/tablehandles.cxx | 4
svx/source/table/tablehandles.hxx | 6
svx/source/table/tablertfimporter.cxx | 2
svx/source/table/tableundo.hxx | 8 -
svx/source/table/viewcontactoftableobj.cxx | 4
svx/source/tbxctrls/bulletsnumbering.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 12 -
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 6
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/UnoNameItemTable.hxx | 2
svx/source/unodraw/UnoNamespaceMap.cxx | 4
svx/source/unodraw/XPropertyTable.cxx | 2
svx/source/unodraw/unoshap2.cxx | 8 -
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xml/xmlxtimp.cxx | 4
svx/source/xoutdev/xtable.cxx | 2
137 files changed, 420 insertions(+), 420 deletions(-)
New commits:
commit b4cb9bc2b80e316ff615e14c4a5ae2a1ab492f91
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Mar 13 10:40:39 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Mar 13 19:21:28 2020 +0100
Revert "loplugin:constfields in svx"
This reverts commit 1a6397030381a45f27ab7a2a02e6e6d0f9987c84.
Change-Id: Iaa706bb4ea3144ef57ab359b982400abc589b97e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90454
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index e997f872a8c5..d40251c41237 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -63,7 +63,7 @@ public:
parent/child relationships with the shape as initiator.
Note that NULL is a valid value for this member.
*/
- IAccessibleParent* const mpChildrenManager;
+ IAccessibleParent* mpChildrenManager;
/** Copy the given values into the members described above.
*/
diff --git a/include/svx/ClassificationField.hxx b/include/svx/ClassificationField.hxx
index f742e5dda4ed..f932a665fde1 100644
--- a/include/svx/ClassificationField.hxx
+++ b/include/svx/ClassificationField.hxx
@@ -61,10 +61,10 @@ public:
class SVX_DLLPUBLIC ClassificationField final : public SvxFieldData
{
public:
- ClassificationType const meType;
- OUString const msDescription;
- OUString const msFullClassName;
- OUString const msIdentifier;
+ ClassificationType meType;
+ OUString msDescription;
+ OUString msFullClassName;
+ OUString msIdentifier;
ClassificationField(ClassificationType eType, OUString const & sDescription, OUString const & sFullClassName, OUString const & sIdentifier)
: SvxFieldData()
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index a8e95ba52877..8976b2bdb106 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -117,8 +117,8 @@ class SVXCORE_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet
css::uno::Sequence< css::beans::PropertyValues > seqHandles;
css::uno::Sequence< css::awt::Size > seqSubViewSize;
- bool const bFilled : 1;
- bool const bStroked : 1;
+ bool bFilled : 1;
+ bool bStroked : 1;
bool bFlipH;
bool bFlipV;
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index c4caae2aa0ca..32cf5f28a8b4 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -27,18 +27,18 @@
struct SvxMSDffVertPair
{
- sal_Int32 const nValA;
- sal_Int32 const nValB;
+ sal_Int32 nValA;
+ sal_Int32 nValB;
};
struct SvxMSDffCalculationData
{
- sal_uInt16 const nFlags;
- sal_Int32 const nVal[ 3 ];
+ sal_uInt16 nFlags;
+ sal_Int32 nVal[ 3 ];
};
struct SvxMSDffTextRectangles
{
- SvxMSDffVertPair const nPairA;
- SvxMSDffVertPair const nPairB;
+ SvxMSDffVertPair nPairA;
+ SvxMSDffVertPair nPairB;
};
enum class SvxMSDffHandleFlags
@@ -65,28 +65,28 @@ namespace o3tl
struct SvxMSDffHandle
{
- SvxMSDffHandleFlags const nFlags;
+ SvxMSDffHandleFlags nFlags;
sal_Int32 nPositionX, nPositionY, nCenterX, nCenterY, nRangeXMin, nRangeXMax, nRangeYMin, nRangeYMax;
};
struct mso_CustomShape
{
- SvxMSDffVertPair* const pVertices;
- sal_uInt32 const nVertices;
- sal_uInt16* const pElements;
- sal_uInt32 const nElements;
- SvxMSDffCalculationData* const pCalculation;
- sal_uInt32 const nCalculation;
- sal_Int32* const pDefData;
- SvxMSDffTextRectangles* const pTextRect;
- sal_uInt32 const nTextRect;
- sal_Int32 const nCoordWidth;
- sal_Int32 const nCoordHeight;
- sal_Int32 const nXRef;
- sal_Int32 const nYRef;
- SvxMSDffVertPair* const pGluePoints;
- sal_uInt32 const nGluePoints;
- SvxMSDffHandle* const pHandles;
- sal_uInt32 const nHandles;
+ SvxMSDffVertPair* pVertices;
+ sal_uInt32 nVertices;
+ sal_uInt16* pElements;
+ sal_uInt32 nElements;
+ SvxMSDffCalculationData* pCalculation;
+ sal_uInt32 nCalculation;
+ sal_Int32* pDefData;
+ SvxMSDffTextRectangles* pTextRect;
+ sal_uInt32 nTextRect;
+ sal_Int32 nCoordWidth;
+ sal_Int32 nCoordHeight;
+ sal_Int32 nXRef;
+ sal_Int32 nYRef;
+ SvxMSDffVertPair* pGluePoints;
+ sal_uInt32 nGluePoints;
+ SvxMSDffHandle* pHandles;
+ sal_uInt32 nHandles;
};
#define MSO_I | sal_Int32(0x80000000)
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index 42dbf494cb3c..a614d97ebbd9 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -71,7 +71,7 @@ namespace com { namespace sun { namespace star { namespace frame {
struct ActionReference
{
css::uno::Reference< css::smarttags::XSmartTagAction > mxSmartTagAction;
- sal_Int32 const mnSmartTagIndex;
+ sal_Int32 mnSmartTagIndex;
ActionReference( css::uno::Reference< css::smarttags::XSmartTagAction > const & xSmartTagAction, sal_Int32 nSmartTagIndex )
: mxSmartTagAction( xSmartTagAction), mnSmartTagIndex( nSmartTagIndex ) {}
};
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index 25ac0815384a..5ee3858c7731 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -28,7 +28,7 @@ class SVXCORE_DLLPUBLIC SvxPresetListBox final : public SvtValueSet
{
private:
static constexpr sal_uInt32 nColCount = 3;
- Size const aIconSize;
+ Size aIconSize;
Link<SvxPresetListBox*,void> maRenameHdl;
Link<SvxPresetListBox*,void> maDeleteHdl;
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index 23374d377fcd..b703aa224bec 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -85,7 +85,7 @@ private:
friend class ListBoxColorWrapper;
std::unique_ptr<ColorWindow> m_xColorWindow;
std::unique_ptr<weld::MenuButton> m_xButton;
- weld::Window* const m_pTopLevel;
+ weld::Window* m_pTopLevel;
Link<ColorListBox&, void> m_aSelectedLink;
ListBoxColorWrapper m_aColorWrapper;
Color m_aAutoDisplayColor;
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index fe32bd066cc8..2452a2ae5827 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -63,15 +63,15 @@ private:
VclPtr<PushButton> mpButtonNoneColor;
VclPtr<PushButton> mpButtonPicker;
VclPtr<FixedLine> mpAutomaticSeparator;
- OUString const maCommand;
+ OUString maCommand;
Link<const NamedColor&, void> maSelectedLink;
VclPtr<vcl::Window> mxParentWindow;
std::shared_ptr<PaletteManager> mxPaletteManager;
ColorStatus& mrColorStatus;
- ColorSelectFunction const maColorSelectFunction;
- bool const mbReuseParentForPicker;
+ ColorSelectFunction maColorSelectFunction;
+ bool mbReuseParentForPicker;
DECL_LINK( SelectHdl, ValueSet*, void );
DECL_LINK( SelectPaletteHdl, ListBox&, void);
@@ -141,11 +141,11 @@ class SVXCORE_DLLPUBLIC ColorWindow final : public WeldToolbarPopup
private:
const sal_uInt16 theSlotId;
OUString maCommand;
- weld::Window* const mpParentWindow;
+ weld::Window* mpParentWindow;
MenuOrToolMenuButton maMenuButton;
std::shared_ptr<PaletteManager> mxPaletteManager;
ColorStatus& mrColorStatus;
- ColorSelectFunction const maColorSelectFunction;
+ ColorSelectFunction maColorSelectFunction;
std::unique_ptr<ColorValueSet> mxColorSet;
std::unique_ptr<ColorValueSet> mxRecentColorSet;
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index 9a0969f8f547..a29225263efb 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -53,9 +53,9 @@ private:
std::unique_ptr<weld::ComboBox> m_xInterpolationCombo;
SdrGrafObj* m_xGraphicObj;
- Graphic const m_aGraphic;
- Size const m_aViewSize100mm;
- tools::Rectangle m_aCropRectangle;
+ Graphic m_aGraphic;
+ Size m_aViewSize100mm;
+ tools::Rectangle m_aCropRectangle;
SfxBindings& m_rBindings;
double m_dResolution;
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 7401acbc9990..ac943d9cfcff 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -144,7 +144,7 @@ namespace svx
ODataAccessDescriptor m_aDescriptor;
OUString m_sCompatibleFormat;
- ColumnTransferFormatFlags const m_nFormatFlags;
+ ColumnTransferFormatFlags m_nFormatFlags;
};
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 156b38e0c827..9c0515b86243 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -55,8 +55,8 @@ class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction
class SAL_WARN_UNUSED E3dRotateUndoAction final : public E3dUndoAction
{
private:
- basegfx::B3DHomMatrix const maMyOldRotation;
- basegfx::B3DHomMatrix const maMyNewRotation;
+ basegfx::B3DHomMatrix maMyOldRotation;
+ basegfx::B3DHomMatrix maMyNewRotation;
public:
E3dRotateUndoAction(
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 021cd080e28f..d6f985ae4912 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -200,7 +200,7 @@ private:
// Model, Page, View etc. for favourites
std::unique_ptr<FmFormModel> pModel;
- SfxBindings* const pBindings;
+ SfxBindings* pBindings;
std::unique_ptr<Svx3DCtrlItem> pControllerItem;
std::unique_ptr<SvxConvertTo3DItem> pConvertTo3DItem;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 394acb685d52..ca0a13a902f1 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -61,7 +61,7 @@ namespace svx
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmDesignModeChangedHint final : public SfxHint
{
- bool const m_bDesignMode;
+ bool m_bDesignMode;
public:
FmDesignModeChangedHint( bool bDesMode );
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 582f4d83defe..7f5eaa21ff0b 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -160,7 +160,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine final
// Since the iterator could have more columns, as managed here (in this field listbox),
// a mapping of this css::form keys on the indices of the respective columns is kept in the iterator
- CharClass const m_aCharacterClassficator;
+ CharClass m_aCharacterClassficator;
CollatorWrapper m_aStringCompare;
// the collection of all interesting fields (or their css::data::XDatabaseVariant interfaces and FormatKeys)
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 7bf2c3456c57..ca639cddf4ea 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -40,7 +40,7 @@ private:
INetURLObject aSdvURL;
INetURLObject aStrURL;
sal_uInt32 nId;
- bool const bReadOnly;
+ bool bReadOnly;
bool bModified;
bool bThemeNameFromResource;
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 6cd95b4bf548..4d7c03757375 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -174,10 +174,10 @@ class GalleryHint final : public SfxHint
{
private:
- GalleryHintType const mnType;
- OUString const maThemeName;
- OUString const maStringData;
- void* const mnData1;
+ GalleryHintType mnType;
+ OUString maThemeName;
+ OUString maStringData;
+ void* mnData1;
public:
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index d676ab6f3191..44f85f19c6eb 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -77,7 +77,7 @@ private:
OUString m_aDestDir;
bool m_bDestDirRelative;
tools::SvRef<SotStorage> aSvDrawStorageRef;
- Gallery* const pParent;
+ Gallery* pParent;
GalleryThemeEntry* pThm;
sal_uInt32 mnThemeLockCount;
sal_uInt32 mnBroadcasterLockCount;
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 91b8babb2614..11a5854eebd3 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -54,7 +54,7 @@ class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
Link<GraphCtrl*,void> aMousePosLink;
Link<GraphCtrl*,void> aGraphSizeLink;
Link<GraphCtrl*,void> aUpdateLink;
- MapMode const aMap100;
+ MapMode aMap100;
Size aGraphSize;
Point aMousePos;
std::unique_ptr<GraphCtrlUserCall> pUserCall;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 63ebdedb50f2..01ddead29db4 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -57,7 +57,7 @@ protected:
SvxHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId);
- sal_uInt16 const nId;
+ sal_uInt16 nId;
std::unique_ptr<SfxItemSet> pBBSet;
bool mbDisableQueryBox : 1;
bool mbEnableDrawingLayerFillStyles : 1;
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 1ad0d879ad6b..46956955a872 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -58,7 +58,7 @@ public:
private:
std::unique_ptr<weld::ComboBox> m_xControl;
Link<weld::ComboBox&, void> m_aChangeHdl;
- OUString const m_aAllString;
+ OUString m_aAllString;
std::unique_ptr<css::uno::Sequence<sal_Int16>> m_xSpellUsedLang;
LanguageType m_eSavedLanguage;
EditedAndValid m_eEditedAndValid;
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 563920af41ca..2e4f8fb2716f 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -176,7 +176,7 @@ public:
private:
SvNumberFormatter* pFormatter;
SvNumberFormatTable* pCurFmtTable;
- SvxNumberValueType const eValType;
+ SvxNumberValueType eValType;
OUString aValStr;
double nValNum;
bool bUndoAddList;
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index de3c88101449..2002638d794d 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -61,10 +61,10 @@ public:
SvxNumberValueType GetValueType() const { return eValueType; }
private:
- SvNumberFormatter* const pFormatter;
- SvxNumberValueType const eValueType;
- OUString const aStringVal;
- double const nDoubleVal;
+ SvNumberFormatter* pFormatter;
+ SvxNumberValueType eValueType;
+ OUString aStringVal;
+ double nDoubleVal;
std::vector<sal_uInt32> mvDelFormats;
};
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 1d8b5e2ceeca..ce86b0653a87 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC OfaPtrItem final : public SfxPoolItem
{
private:
- void* const pPtr;
+ void* pPtr;
public:
OfaPtrItem( sal_uInt16 nWhich, void *pPtr );
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 273f203439b9..3f69209c8be3 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -25,8 +25,8 @@
class SVX_DLLPUBLIC SvxPasswordDialog final : public SfxDialogController
{
private:
- OUString const m_aOldPasswdErrStr;
- OUString const m_aRepeatPasswdErrStr;
+ OUString m_aOldPasswdErrStr;
+ OUString m_aRepeatPasswdErrStr;
Link<SvxPasswordDialog*,bool> m_aCheckPasswordHdl;
std::unique_ptr<weld::Label> m_xOldFL;
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index b27b49ca1b27..d0dd4e68228e 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -104,7 +104,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
long lLogicNullOffset; // in logic coordinates
long lAppNullOffset; // in logic coordinates
long lInitialDragPos;
- SvxRulerSupportFlags const nFlags;
+ SvxRulerSupportFlags nFlags;
SvxRulerDragFlags nDragType;
sal_uInt16 nDefTabType;
sal_uInt16 nTabCount;
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 35079a47e4c7..80059b791ba1 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -31,21 +31,21 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition
{
// the Bitmaps
- BitmapEx const maBitmapEx1;
- BitmapEx const maBitmapEx2;
+ BitmapEx maBitmapEx1;
+ BitmapEx maBitmapEx2;
// position of the basePosition inside the Bitmaps, in pixels
- sal_uInt16 const mnCenterX1;
- sal_uInt16 const mnCenterY1;
- sal_uInt16 const mnCenterX2;
- sal_uInt16 const mnCenterY2;
+ sal_uInt16 mnCenterX1;
+ sal_uInt16 mnCenterY1;
+ sal_uInt16 mnCenterX2;
+ sal_uInt16 mnCenterY2;
// #i53216# added CursorBlinkTime (in ms)
- sal_uInt32 const mnBlinkTime;
+ sal_uInt32 mnBlinkTime;
// optional shear and rotation
- double const mfShearX;
- double const mfRotation;
+ double mfShearX;
+ double mfRotation;
// Flag to remember which state to draw. Inited with false (0)
bool mbOverlayState : 1;
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index a0022e1c7bda..fbfce1ee3a61 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -31,16 +31,16 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition
{
// the Bitmap itself
- BitmapEx const maBitmapEx;
+ BitmapEx maBitmapEx;
// position of the basePosition inside the Bitmap, in pixels
- sal_uInt16 const mnCenterX;
- sal_uInt16 const mnCenterY;
+ sal_uInt16 mnCenterX;
+ sal_uInt16 mnCenterY;
// optional transparency, shear and rotation
- double const mfAlpha;
- double const mfShearX;
- double const mfRotation;
+ double mfAlpha;
+ double mfShearX;
+ double mfRotation;
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index c3b9b340ab35..f75f42107520 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -69,7 +69,7 @@ namespace sdr
sal_uInt32 mnStripeLengthPixel; // defaults to 4L
// hold an incarnation of Drawinglayer configuration options
- SvtOptionsDrawinglayer const maDrawinglayerOpt;
+ SvtOptionsDrawinglayer maDrawinglayerOpt;
// hold buffered the logic length of discrete vector (1.0, 0.0) and the
// view transformation belonging to it. Update happens in getDiscreteOne()
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index 80442723395d..88c7404e6a3d 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -31,7 +31,7 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject
{
// geometry
- basegfx::B2DPolyPolygon const maLinePolyPolygon;
+ basegfx::B2DPolyPolygon maLinePolyPolygon;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index ec328f81da71..dc40a87597dd 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -38,7 +38,7 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlaySelection final : public OverlayObject
{
// type of overlay
- OverlayType const meOverlayType;
+ OverlayType meOverlayType;
// geometry of overlay
std::vector< basegfx::B2DRange > maRanges;
@@ -49,7 +49,7 @@ namespace sdr
OverlayType maLastOverlayType;
sal_uInt16 mnLastTransparence;
- bool const mbBorder : 1;
+ bool mbBorder : 1;
// geometry creation for OverlayObject, can use local *Last* values
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx
index f186365af829..1767c918fb28 100644
--- a/include/svx/selctrl.hxx
+++ b/include/svx/selctrl.hxx
@@ -38,7 +38,7 @@ public:
private:
sal_uInt16 mnState;
- Image const maImage;
+ Image maImage;
};
#endif
diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx
index ce19baf92eb0..5b5d2123cb26 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -45,13 +45,13 @@ public:
private:
LinePropertyPanelBase& m_rParent;
std::array<OUString,9> maStrUnits;
- OUString const m_sPt;
+ OUString m_sPt;
MapUnit m_eMapUnit;
bool m_bVSFocus;
bool m_bCustom;
long m_nCustomWidth;
- Image const m_aIMGCus;
- Image const m_aIMGCusGray;
+ Image m_aIMGCus;
+ Image m_aIMGCusGray;
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xTopLevel;
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 43a8c7ef1ece..26e88a7dbcd1 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -51,7 +51,7 @@ public:
class SVXCORE_DLLPUBLIC SdrDragEntryPolyPolygon final : public SdrDragEntry
{
private:
- basegfx::B2DPolyPolygon const maOriginalPolyPolygon;
+ basegfx::B2DPolyPolygon maOriginalPolyPolygon;
public:
SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon);
@@ -66,7 +66,7 @@ class SdrDragEntrySdrObject final : public SdrDragEntry
private:
const SdrObject& maOriginal;
SdrObjectUniquePtr mxClone;
- bool const mbModify;
+ bool mbModify;
public:
SdrDragEntrySdrObject(
@@ -87,7 +87,7 @@ public:
class SdrDragEntryPrimitive2DSequence final : public SdrDragEntry
{
private:
- drawinglayer::primitive2d::Primitive2DContainer const maPrimitive2DSequence;
+ drawinglayer::primitive2d::Primitive2DContainer maPrimitive2DSequence;
public:
SdrDragEntryPrimitive2DSequence(
@@ -101,8 +101,8 @@ public:
class SdrDragEntryPointGlueDrag final : public SdrDragEntry
{
private:
- std::vector< basegfx::B2DPoint > const maPositions;
- bool const mbIsPointDrag;
+ std::vector< basegfx::B2DPoint > maPositions;
+ bool mbIsPointDrag;
public:
SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag);
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 61a9aed78c62..4c77c94614ee 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -264,7 +264,7 @@ class SVXCORE_DLLPUBLIC SdrHdlColor final : public SdrHdl
Link<SdrHdlColor*,void> aColorChangeHdl;
// use luminance values only
- bool const bUseLuminance : 1;
+ bool bUseLuminance : 1;
// create marker for this kind
SVX_DLLPRIVATE virtual void CreateB2dIAObject() override;
@@ -299,7 +299,7 @@ private:
Point a2ndPos;
// is this a gradient or a transparence
- bool const bGradient : 1;
+ bool bGradient : 1;
// select which handle to move
bool bMoveSingleHandle : 1;
@@ -429,7 +429,7 @@ class SVXCORE_DLLPUBLIC SdrHdlList
{
protected:
size_t mnFocusIndex;
- SdrMarkView* const pView;
+ SdrMarkView* pView;
std::deque<std::unique_ptr<SdrHdl>> maList;
sal_uInt16 nHdlSize;
@@ -502,20 +502,20 @@ private:
// evtl. shear and rotation, equal to the object's one to allow adaptation of
// the visualization handles
- double const mfShearX;
- double const mfRotation;
+ double mfShearX;
+ double mfRotation;
};
class SdrCropViewHdl final : public SdrHdl
{
private:
- basegfx::B2DHomMatrix const maObjectTransform;
- Graphic const maGraphic;
- double const mfCropLeft;
- double const mfCropTop;
- double const mfCropRight;
- double const mfCropBottom;
+ basegfx::B2DHomMatrix maObjectTransform;
+ Graphic maGraphic;
+ double mfCropLeft;
+ double mfCropTop;
+ double mfCropRight;
+ double mfCropBottom;
public:
SdrCropViewHdl(
diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx
index 17dae03fd2fc..8f1b022db894 100644
--- a/include/svx/svditer.hxx
+++ b/include/svx/svditer.hxx
@@ -39,7 +39,7 @@ class SVXCORE_DLLPUBLIC SdrObjListIter
{
std::vector< const SdrObject* > maObjList;
size_t mnIndex;
- bool const mbReverse;
+ bool mbReverse;
bool mbUseZOrder;
void ImpProcessObjectList(const SdrObjList& rSdrObjList, SdrIterMode eMode);
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 3a7fa8d45fa8..cc9e0d4bf91b 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -66,7 +66,7 @@ class SVXCORE_DLLPUBLIC SdrLayer
bool mbPrintableODF; // corresponds to ODF draw:display
bool mbLockedODF; // corresponds to ODF draw:protected
SdrModel* pModel; // For broadcasting
- SdrLayerID const nID;
+ SdrLayerID nID;
SdrLayer(SdrLayerID nNewID, const OUString& rNewName);
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index c1226a9c64a7..a02cf8f5d80b 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -109,7 +109,7 @@ enum class SdrHintKind
class SVXCORE_DLLPUBLIC SdrHint final : public SfxHint
{
private:
- SdrHintKind const meHint;
+ SdrHintKind meHint;
const SdrObject* mpObj;
const SdrPage* mpPage;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 84792d2b8bd8..b39cceadd7bf 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -203,8 +203,8 @@ public:
*/
class SVXCORE_DLLPUBLIC SdrObjUserData
{
- SdrInventor const nInventor;
- sal_uInt16 const nIdentifier;
+ SdrInventor nInventor;
+ sal_uInt16 nIdentifier;
void operator=(const SdrObjUserData& rData) = delete;
bool operator==(const SdrObjUserData& rData) const = delete;
@@ -1041,8 +1041,8 @@ struct SVXCORE_DLLPUBLIC SdrObjectFreeOp
struct SdrObjCreatorParams
{
- SdrInventor const nInventor;
- sal_uInt16 const nObjIdentifier;
+ SdrInventor nInventor;
+ sal_uInt16 nObjIdentifier;
SdrModel& rSdrModel;
};
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index f3b2053ae08d..e77713e9c2db 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -280,8 +280,8 @@ private:
/// for the snap-to-grid in Writer
class SdrPageGridFrame
{
- tools::Rectangle const aPaper;
- tools::Rectangle const aUserArea;
+ tools::Rectangle aPaper;
+ tools::Rectangle aUserArea;
public:
SdrPageGridFrame(const tools::Rectangle& rPaper, const tools::Rectangle& rUser): aPaper(rPaper), aUserArea(rUser) {}
const tools::Rectangle& GetPaperRect() const { return aPaper; }
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 41736c3dae43..1b96b01ac75f 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -157,7 +157,7 @@ protected:
sal_uInt16 mnMinMovLog;
// Hold an incarnation of Drawinglayer configuration options
- SvtOptionsDrawinglayer const maDrawinglayerOpt;
+ SvtOptionsDrawinglayer maDrawinglayerOpt;
bool mbPageVisible : 1;
bool mbPageShadowVisible : 1;
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index cc3d7b14a6da..9e5bca9fdf0e 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -277,8 +277,8 @@ class SVXCORE_DLLPUBLIC SdrFormatter {
long nDiv_;
short nComma_;
bool bDirty;
- MapUnit const eSrcMU;
- MapUnit const eDstMU;
+ MapUnit eSrcMU;
+ MapUnit eDstMU;
private:
SVX_DLLPRIVATE void Undirty();
public:
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index d863c3401f4f..182d384ec0fa 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -182,7 +182,7 @@ public:
class SVXCORE_DLLPUBLIC SdrUndoMoveObj final : public SdrUndoObj
{
- Size const aDistance; // Distance by which we move
+ Size aDistance; // Distance by which we move
public:
SdrUndoMoveObj(SdrObject& rNewObj, const Size& rDist): SdrUndoObj(rNewObj),aDistance(rDist) {}
@@ -364,8 +364,8 @@ public:
class SdrUndoObjOrdNum final : public SdrUndoObj
{
- sal_uInt32 const nOldOrdNum;
- sal_uInt32 const nNewOrdNum;
+ sal_uInt32 nOldOrdNum;
+ sal_uInt32 nNewOrdNum;
public:
SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
@@ -381,8 +381,8 @@ public:
class SVXCORE_DLLPUBLIC SdrUndoObjectLayerChange final : public SdrUndoObj
{
- SdrLayerID const maOldLayer;
- SdrLayerID const maNewLayer;
+ SdrLayerID maOldLayer;
+ SdrLayerID maNewLayer;
public:
SdrUndoObjectLayerChange(SdrObject& rObj, SdrLayerID aOldLayer, SdrLayerID aNewLayer);
@@ -400,7 +400,7 @@ protected:
pNewText;
bool bNewTextAvailable;
bool bEmptyPresObj;
- sal_Int32 const mnText;
+ sal_Int32 mnText;
public:
SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText );
@@ -462,9 +462,9 @@ private:
class SdrUndoLayer : public SdrUndoAction
{
protected:
- SdrLayer* const pLayer;
+ SdrLayer* pLayer;
SdrLayerAdmin* pLayerAdmin;
- sal_uInt16 const nNum;
+ sal_uInt16 nNum;
bool bItsMine;
protected:
@@ -620,8 +620,8 @@ public:
class SdrUndoSetPageNum final : public SdrUndoPage
{
- sal_uInt16 const nOldPageNum;
- sal_uInt16 const nNewPageNum;
+ sal_uInt16 nOldPageNum;
+ sal_uInt16 nNewPageNum;
public:
SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1)
@@ -646,7 +646,7 @@ public:
class SdrUndoPageMasterPage : public SdrUndoPage
{
protected:
- bool const mbOldHadMasterPage;
+ bool mbOldHadMasterPage;
SdrLayerIDSet maOldSet;
sal_uInt16 maOldMasterPageNumber;
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index cff7f6ad4a49..6d9a757c5f29 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
@@ -27,7 +27,7 @@
class SVX_DLLPUBLIC SvxGraphicItem final : public SfxPoolItem
{
- Graphic const aGraphic;
+ Graphic aGraphic;
public:
SvxGraphicItem( const Graphic& rGraphic);
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index d9feb8da06f1..1c2ff45e185a 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -68,7 +68,7 @@ namespace svx
ToolboxButtonColorUpdaterBase& operator =(ToolboxButtonColorUpdaterBase const &) = delete;
protected:
- bool const mbWideButton;
+ bool mbWideButton;
bool mbWasHiContrastMode;
Color maCurColor;
tools::Rectangle maUpdRect;
@@ -96,7 +96,7 @@ namespace svx
private:
- sal_uInt16 const mnBtnId;
+ sal_uInt16 mnBtnId;
VclPtr<ToolBox> mpTbx;
virtual void SetQuickHelpText(const OUString& rText) override;
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 7c6b60291886..1f948f50574b 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -850,7 +850,7 @@ private:
virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
- OUString const referer_;
+ OUString referer_;
};
#endif
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 41f726d22e23..63ebd758140d 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -67,7 +67,7 @@ namespace svx
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
- OXFormsDescriptor const m_aDescriptor;
+ OXFormsDescriptor m_aDescriptor;
public:
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 24fcddef171a..db1f1a7e658c 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -56,7 +56,7 @@ public:
class SVXCORE_DLLPUBLIC XLineEndEntry final : public XPropertyEntry
{
private:
- basegfx::B2DPolyPolygon const aB2DPolyPolygon;
+ basegfx::B2DPolyPolygon aB2DPolyPolygon;
public:
XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName);
@@ -71,7 +71,7 @@ public:
class SVXCORE_DLLPUBLIC XDashEntry final : public XPropertyEntry
{
private:
- XDash const aDash;
+ XDash aDash;
public:
XDashEntry(const XDash& rDash, const OUString& rName);
@@ -86,7 +86,7 @@ public:
class SVXCORE_DLLPUBLIC XHatchEntry final : public XPropertyEntry
{
private:
- XHatch const aHatch;
+ XHatch aHatch;
public:
XHatchEntry(const XHatch& rHatch, const OUString& rName);
@@ -101,7 +101,7 @@ public:
class SVXCORE_DLLPUBLIC XGradientEntry final : public XPropertyEntry
{
private:
- XGradient const aGradient;
+ XGradient aGradient;
public:
XGradientEntry(const XGradient& rGradient, const OUString& rName);
@@ -116,7 +116,7 @@ public:
class SVXCORE_DLLPUBLIC XBitmapEntry final : public XPropertyEntry
{
private:
- GraphicObject const maGraphicObject;
+ GraphicObject maGraphicObject;
public:
XBitmapEntry(const GraphicObject& rGraphicObject, const OUString& rName);
@@ -153,10 +153,10 @@ class XGradientList ; typedef rtl::Reference< class XGradientList > XGradientLis
class SVXCORE_DLLPUBLIC XPropertyList : public cppu::OWeakObject
{
protected:
- XPropertyListType const meType;
+ XPropertyListType meType;
OUString maName; // not persistent
OUString maPath;
- OUString const maReferer;
+ OUString maReferer;
std::vector< std::unique_ptr<XPropertyEntry> > maList;
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index 924be126ae53..4508fcf3dc7b 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -47,7 +47,7 @@ private:
class SVX_DLLPUBLIC SvxZoomPageStatusBarControl final : public SfxStatusBarControl
{
private:
- Image const maImage;
+ Image maImage;
public:
virtual void Paint( const UserDrawEvent& rEvt ) override;
virtual bool MouseButtonDown( const MouseEvent & rEvt ) override;
diff --git a/svx/inc/CommonStylePreviewRenderer.hxx b/svx/inc/CommonStylePreviewRenderer.hxx
index 3cb6bf0441d0..c45b785c1344 100644
--- a/svx/inc/CommonStylePreviewRenderer.hxx
+++ b/svx/inc/CommonStylePreviewRenderer.hxx
@@ -29,7 +29,7 @@ class CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer
Color maFontColor;
Color maBackgroundColor;
Size maPixelSize;
- OUString const maStyleName;
+ OUString maStyleName;
public:
CommonStylePreviewRenderer(const SfxObjectShell& rShell, OutputDevice& rOutputDev,
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 9009bdff06c9..d174d966c062 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -57,7 +57,7 @@ class E3dDragMethod : public SdrDragMethod
{
protected:
::std::vector< E3dDragMethodUnit > maGrp;
- E3dDragConstraint const meConstraint;
+ E3dDragConstraint meConstraint;
Point maLastPos;
tools::Rectangle maFullBound;
bool mbMoveFull;
diff --git a/svx/inc/palettes.hxx b/svx/inc/palettes.hxx
index 635724719e9c..ba3eaf644418 100644
--- a/svx/inc/palettes.hxx
+++ b/svx/inc/palettes.hxx
@@ -32,7 +32,7 @@ typedef std::vector< NamedColor > ColorList;
class PaletteASE final : public Palette
{
bool mbValidPalette;
- OUString const maFPath;
+ OUString maFPath;
OUString maASEPaletteName;
ColorList maColors;
@@ -55,8 +55,8 @@ class PaletteGPL final : public Palette
{
bool mbLoadedPalette;
bool mbValidPalette;
- OUString const maFName;
- OUString const maFPath;
+ OUString maFName;
+ OUString maFPath;
OUString maGPLPaletteName;
ColorList maColors;
@@ -80,8 +80,8 @@ public:
class PaletteSOC final : public Palette
{
bool mbLoadedPalette;
- OUString const maFPath;
- OUString const maSOCPaletteName;
+ OUString maFPath;
+ OUString maSOCPaletteName;
XColorListRef mpColorList;
public:
PaletteSOC( const OUString &rFPath, const OUString &rFName );
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index e877b61d37a4..cec8c0cbb2f6 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -123,7 +123,7 @@ public:
class ViewContactOfGrid final : public ViewContactOfPageSubObject
{
- bool const mbFront : 1;
+ bool mbFront : 1;
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
@@ -137,7 +137,7 @@ public:
class ViewContactOfHelplines final : public ViewContactOfPageSubObject
{
- bool const mbFront : 1;
+ bool mbFront : 1;
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx
index 4d86f2bfc000..fea09902bbc9 100644
--- a/svx/inc/sdr/overlay/overlayhandle.hxx
+++ b/svx/inc/sdr/overlay/overlayhandle.hxx
@@ -19,8 +19,8 @@ namespace sdr { namespace overlay {
class OverlayHandle final : public OverlayObjectWithBasePosition
{
- basegfx::B2DSize const maSize;
- Color const maStrokeColor;
+ basegfx::B2DSize maSize;
+ Color maStrokeColor;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx
index b46712eae8cb..84077f10367d 100644
--- a/svx/inc/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/sdr/overlay/overlayhelpline.hxx
@@ -31,7 +31,7 @@ namespace sdr
class OverlayHelplineStriped final : public OverlayObjectWithBasePosition
{
// remember HelpLineKind
- SdrHelpLineKind const meKind;
+ SdrHelpLineKind meKind;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx
index c365f79d42eb..33ec22c0e25d 100644
--- a/svx/inc/sdr/overlay/overlayline.hxx
+++ b/svx/inc/sdr/overlay/overlayline.hxx
@@ -30,7 +30,7 @@ namespace sdr
class OverlayLineStriped final : public OverlayObjectWithBasePosition
{
// second position in pixel
- basegfx::B2DPoint const maSecondPosition;
+ basegfx::B2DPoint maSecondPosition;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index f03f7bd9b9bb..7f4dfd895eb3 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -30,14 +30,14 @@ namespace sdr
class OverlayRectangle final : public OverlayObjectWithBasePosition
{
// geometric definitions
- basegfx::B2DPoint const maSecondPosition;
+ basegfx::B2DPoint maSecondPosition;
const double mfTransparence;
const double mfDiscreteGrow;
const double mfDiscreteShrink;
const double mfRotation;
// #i53216# added CursorBlinkTime (in ms)
- sal_uInt32 const mnBlinkTime;
+ sal_uInt32 mnBlinkTime;
// Flag to remember which state to draw. Inited with false (0)
bool mbOverlayState : 1;
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index d31ff48405c7..7a18f1cb4b8f 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -33,10 +33,10 @@ namespace sdr
basegfx::B2DPoint maSecondPosition;
// Flag to switch on/off long lines to the OutputDevice bounds
- bool const mbExtendedLines : 1;
+ bool mbExtendedLines : 1;
// Flag to switch on/off the bounds itself
- bool const mbShowBounds : 1;
+ bool mbShowBounds : 1;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
index 5d0f07006e60..8649e866d7dd 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -29,16 +29,16 @@ namespace drawinglayer { namespace primitive2d {
class OverlayStaticRectanglePrimitive final : public DiscreteMetricDependentPrimitive2D
{
private:
- basegfx::B2DPoint const maPosition;
- basegfx::B2DSize const maSize;
+ basegfx::B2DPoint maPosition;
+ basegfx::B2DSize maSize;
// the graphic definition
- basegfx::BColor const maStrokeColor;
- basegfx::BColor const maFillColor;
- double const mfTransparence;
+ basegfx::BColor maStrokeColor;
+ basegfx::BColor maFillColor;
+ double mfTransparence;
// the rotation of the primitive itself
- double const mfRotation;
+ double mfRotation;
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
@@ -71,19 +71,19 @@ namespace drawinglayer
{
private:
// The BitmapEx to use, PixelSize is used
- BitmapEx const maBitmapEx;
+ BitmapEx maBitmapEx;
// The logic position
- basegfx::B2DPoint const maBasePosition;
+ basegfx::B2DPoint maBasePosition;
// The pixel inside the BitmapEx which is assocciated with
// the target position (offset in the bitmap)
- sal_uInt16 const mnCenterX;
- sal_uInt16 const mnCenterY;
+ sal_uInt16 mnCenterX;
+ sal_uInt16 mnCenterY;
// evtl. rotation and shear around center
- double const mfShearX;
- double const mfRotation;
+ double mfShearX;
+ double mfRotation;
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
@@ -122,12 +122,12 @@ namespace drawinglayer
{
private:
// The logic position
- basegfx::B2DPoint const maBasePosition;
+ basegfx::B2DPoint maBasePosition;
// The stripe colors and length
- basegfx::BColor const maRGBColorA;
- basegfx::BColor const maRGBColorB;
- double const mfDiscreteDashLength;
+ basegfx::BColor maRGBColorA;
+ basegfx::BColor maRGBColorB;
+ double mfDiscreteDashLength;
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
@@ -163,18 +163,18 @@ namespace drawinglayer
{
private:
// the logic rectangle definition
- basegfx::B2DRange const maObjectRange;
+ basegfx::B2DRange maObjectRange;
// the graphic definition
- basegfx::BColor const maColor;
- double const mfTransparence;
+ basegfx::BColor maColor;
+ double mfTransparence;
// the discrete grow and shrink of the box
- double const mfDiscreteGrow;
- double const mfDiscreteShrink;
+ double mfDiscreteGrow;
+ double mfDiscreteShrink;
// the rotation of the primitive itself
- double const mfRotation;
+ double mfRotation;
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
@@ -221,15 +221,15 @@ namespace drawinglayer
{
private:
// The logic position
- basegfx::B2DPoint const maBasePosition;
+ basegfx::B2DPoint maBasePosition;
// the style
- HelplineStyle const meStyle;
+ HelplineStyle meStyle;
// The stripe colors and length
- basegfx::BColor const maRGBColorA;
- basegfx::BColor const maRGBColorB;
- double const mfDiscreteDashLength;
+ basegfx::BColor maRGBColorA;
+ basegfx::BColor maRGBColorB;
+ double mfDiscreteDashLength;
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
@@ -268,12 +268,12 @@ namespace drawinglayer
{
private:
// The logic range
- basegfx::B2DRange const maRollingRectangle;
+ basegfx::B2DRange maRollingRectangle;
// The stripe colors and length
- basegfx::BColor const maRGBColorA;
- basegfx::BColor const maRGBColorB;
- double const mfDiscreteDashLength;
+ basegfx::BColor maRGBColorA;
+ basegfx::BColor maRGBColorB;
+ double mfDiscreteDashLength;
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/svx/inc/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx
index 730671f80d83..76e481e645fb 100644
--- a/svx/inc/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/sdr/overlay/overlaytriangle.hxx
@@ -28,8 +28,8 @@ namespace sdr
class OverlayTriangle final : public OverlayObjectWithBasePosition
{
// second and third position in pixel
- basegfx::B2DPoint const maSecondPosition;
- basegfx::B2DPoint const maThirdPosition;
+ basegfx::B2DPoint maSecondPosition;
+ basegfx::B2DPoint maThirdPosition;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index a0ec102cab73..ec6cd2320e41 100644
--- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -36,11 +36,11 @@ namespace drawinglayer
class SdrCaptionPrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
- ::basegfx::B2DHomMatrix const maTransform;
- attribute::SdrLineFillShadowTextAttribute const maSdrLFSTAttribute;
+ ::basegfx::B2DHomMatrix maTransform;
+ attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
::basegfx::B2DPolygon maTail;
- double const mfCornerRadiusX; // [0.0..1.0] relative to 1/2 width
- double const mfCornerRadiusY; // [0.0..1.0] relative to 1/2 height
+ double mfCornerRadiusX; // [0.0..1.0] relative to 1/2 width
+ double mfCornerRadiusY; // [0.0..1.0] relative to 1/2 height
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 64cfddc43203..f115283dc786 100644
--- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -35,8 +35,8 @@ namespace drawinglayer
class SdrConnectorPrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
- attribute::SdrLineShadowTextAttribute const maSdrLSTAttribute;
- ::basegfx::B2DPolygon const maUnitPolygon;
+ attribute::SdrLineShadowTextAttribute maSdrLSTAttribute;
+ ::basegfx::B2DPolygon maUnitPolygon;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 4012ed29613d..6ca417d340c5 100644
--- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -35,17 +35,17 @@ namespace drawinglayer
class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
- attribute::SdrShadowTextAttribute const maSdrSTAttribute;
- Primitive2DContainer const maSubPrimitives;
- basegfx::B2DHomMatrix const maTextBox;
+ attribute::SdrShadowTextAttribute maSdrSTAttribute;
+ Primitive2DContainer maSubPrimitives;
+ basegfx::B2DHomMatrix maTextBox;
// defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
// that the text needs to be block formatted
- bool const mbWordWrap : 1;
+ bool mbWordWrap : 1;
// defines that the object contains/is a 3D AutoShape. Needed for
// making exceptions with shadow generation
- bool const mb3DShape : 1;
+ bool mb3DShape : 1;
protected:
// local decomposition.
diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 746d46a75585..9a498fdada90 100644
--- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -35,8 +35,8 @@ namespace drawinglayer
class SdrEllipsePrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
- ::basegfx::B2DHomMatrix const maTransform;
- attribute::SdrLineFillShadowTextAttribute const maSdrLFSTAttribute;
+ ::basegfx::B2DHomMatrix maTransform;
+ attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -67,11 +67,11 @@ namespace drawinglayer
class SdrEllipseSegmentPrimitive2D final : public SdrEllipsePrimitive2D
{
private:
- double const mfStartAngle;
- double const mfEndAngle;
+ double mfStartAngle;
+ double mfEndAngle;
- bool const mbCloseSegment : 1;
- bool const mbCloseUsingCenter : 1;
+ bool mbCloseSegment : 1;
+ bool mbCloseUsingCenter : 1;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 2a317df334d6..e4e685bfa4d3 100644
--- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -36,9 +36,9 @@ namespace drawinglayer
class SdrGrafPrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
- ::basegfx::B2DHomMatrix const maTransform;
- attribute::SdrLineFillShadowTextAttribute const maSdrLFSTAttribute;
- GraphicObject const maGraphicObject;
+ ::basegfx::B2DHomMatrix maTransform;
+ attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
+ GraphicObject maGraphicObject;
GraphicAttr maGraphicAttr;
// local decomposition.
diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index aa666a4ec051..f4a3b5dc0290 100644
--- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -48,20 +48,20 @@ namespace drawinglayer
class SdrMeasurePrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
- attribute::SdrLineShadowTextAttribute const maSdrLSTAttribute;
- basegfx::B2DPoint const maStart;
- basegfx::B2DPoint const maEnd;
- MeasureTextPosition const meHorizontal;
- MeasureTextPosition const meVertical;
- double const mfDistance;
- double const mfUpper;
- double const mfLower;
- double const mfLeftDelta;
- double const mfRightDelta;
-
- bool const mbBelow : 1;
- bool const mbTextRotation : 1;
- bool const mbTextAutoAngle : 1;
+ attribute::SdrLineShadowTextAttribute maSdrLSTAttribute;
+ basegfx::B2DPoint maStart;
+ basegfx::B2DPoint maEnd;
+ MeasureTextPosition meHorizontal;
+ MeasureTextPosition meVertical;
+ double mfDistance;
+ double mfUpper;
+ double mfLower;
+ double mfLeftDelta;
+ double mfRightDelta;
+
+ bool mbBelow : 1;
+ bool mbTextRotation : 1;
+ bool mbTextAutoAngle : 1;
// internal decomposition helper
Primitive2DReference impCreatePart(
diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
index 722244e463af..fe2d7ff7a9b3 100644
--- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -35,9 +35,9 @@ namespace drawinglayer
class SdrOle2Primitive2D final : public BasePrimitive2D
{
private:
- Primitive2DContainer const maOLEContent;
- basegfx::B2DHomMatrix const maTransform;
- attribute::SdrLineFillShadowTextAttribute const maSdrLFSTAttribute;
+ Primitive2DContainer maOLEContent;
+ basegfx::B2DHomMatrix maTransform;
+ attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
public:
SdrOle2Primitive2D(
diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index b2f3f940bec1..2dec9b986c0c 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -38,12 +38,12 @@ namespace drawinglayer
{
private:
tools::WeakReference<SdrOle2Obj> mpSdrOle2Obj;
- basegfx::B2DHomMatrix const maObjectTransform;
+ basegfx::B2DHomMatrix maObjectTransform;
// #i104867# The GraphicVersion number to identify in operator== if
// the graphic has changed, but without fetching it (which may
// be expensive, e.g. triggering chart creation)
- sal_uInt32 const mnGraphicVersion;
+ sal_uInt32 mnGraphicVersion;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
index 1373c5986cf4..b6944230f18c 100644
--- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -36,9 +36,9 @@ namespace drawinglayer
class SdrPathPrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
- basegfx::B2DHomMatrix const maTransform;
- attribute::SdrLineFillShadowTextAttribute const maSdrLFSTAttribute;
- basegfx::B2DPolyPolygon const maUnitPolyPolygon;
+ basegfx::B2DHomMatrix maTransform;
+ attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
+ basegfx::B2DPolyPolygon maUnitPolyPolygon;
// OperationSmiley: Added to be able to define a FillGeometry different from local
// geometry. It is ignored when empty and/or equal to UnitPolyPolygon.
@@ -49,7 +49,7 @@ namespace drawinglayer
// 'same' is in quotes since it is a UnitPolygon, so being relative to the
// unit polygon of the local geometry (UnitPolyPolygon). The definition is complete
// when applying the also given transformation (maTransform)
- basegfx::B2DPolyPolygon const maUnitDefinitionPolyPolygon;
+ basegfx::B2DPolyPolygon maUnitDefinitionPolyPolygon;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 276bbcdb57c1..e0b561bb7dc1 100644
--- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -35,13 +35,13 @@ namespace drawinglayer
class SdrRectanglePrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
- basegfx::B2DHomMatrix const maTransform;
- attribute::SdrLineFillShadowTextAttribute const maSdrLFSTAttribute;
- double const mfCornerRadiusX; // [0.0..1.0] relative to 1/2 width
- double const mfCornerRadiusY; // [0.0..1.0] relative to 1/2 height
+ basegfx::B2DHomMatrix maTransform;
+ attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
+ double mfCornerRadiusX; // [0.0..1.0] relative to 1/2 width
+ double mfCornerRadiusY; // [0.0..1.0] relative to 1/2 height
// flag which decides if the HitArea should be the filled geometry
- bool const mbForceFillForHitTest : 1;
+ bool mbForceFillForHitTest : 1;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index 1edd4377672a..eac15db3b878 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -109,10 +109,10 @@ namespace drawinglayer
{
private:
// unit contour polygon (scaled to [0.0 .. 1.0])
- basegfx::B2DPolyPolygon const maUnitPolyPolygon;
+ basegfx::B2DPolyPolygon maUnitPolyPolygon;
// complete contour polygon transform (scale, rotate, shear, translate)
- basegfx::B2DHomMatrix const maObjectTransform;
+ basegfx::B2DHomMatrix maObjectTransform;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -149,10 +149,10 @@ namespace drawinglayer
{
private:
// the path to use. Each paragraph will use one Polygon.
- basegfx::B2DPolyPolygon const maPathPolyPolygon;
+ basegfx::B2DPolyPolygon maPathPolyPolygon;
// the Fontwork parameters
- attribute::SdrFormTextAttribute const maSdrFormTextAttribute;
+ attribute::SdrFormTextAttribute maSdrFormTextAttribute;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -189,16 +189,16 @@ namespace drawinglayer
{
private:
// text range transformation from unit range ([0.0 .. 1.0]) to text range
- basegfx::B2DHomMatrix const maTextRangeTransform;
+ basegfx::B2DHomMatrix maTextRangeTransform;
// text alignments
- SdrTextHorzAdjust const maSdrTextHorzAdjust;
- SdrTextVertAdjust const maSdrTextVertAdjust;
+ SdrTextHorzAdjust maSdrTextHorzAdjust;
+ SdrTextVertAdjust maSdrTextVertAdjust;
- bool const mbFixedCellHeight : 1;
- bool const mbUnlimitedPage : 1; // force layout with no text break
- bool const mbCellText : 1; // this is a cell text as block text
- bool const mbWordWrap : 1; // for CustomShapes text layout
+ bool mbFixedCellHeight : 1;
+ bool mbUnlimitedPage : 1; // force layout with no text break
+ bool mbCellText : 1; // this is a cell text as block text
+ bool mbWordWrap : 1; // for CustomShapes text layout
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -245,9 +245,9 @@ namespace drawinglayer
{
private:
// text range transformation from unit range ([0.0 .. 1.0]) to text range
- basegfx::B2DHomMatrix const maTextRangeTransform;
+ basegfx::B2DHomMatrix maTextRangeTransform;
- bool const mbFixedCellHeight : 1;
+ bool mbFixedCellHeight : 1;
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -283,9 +283,9 @@ namespace drawinglayer
class SdrAutoFitTextPrimitive2D final : public SdrTextPrimitive2D
{
private:
- ::basegfx::B2DHomMatrix const maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range
+ ::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range
- bool const mbWordWrap : 1; // for CustomShapes text layout
+ bool mbWordWrap : 1; // for CustomShapes text layout
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -322,7 +322,7 @@ namespace drawinglayer
private:
// XXX: might have position of overflowing text
- ::basegfx::B2DHomMatrix const maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range
+ ::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range
// local decomposition.
virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index 49831dd45aaf..425d2a551058 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -35,7 +35,7 @@ public:
Point* pOldPointAry;
bool bDeleteOldPoints;
sal_uInt16 nSize;
- sal_uInt16 const nResize;
+ sal_uInt16 nResize;
sal_uInt16 nPoints;
ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize=16 );
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 8162a0468b5b..1d767be13d91 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -54,7 +54,7 @@ namespace
{
const char* pResIdName;
const char* pResIdDescr;
- RectPoint const ePoint;
+ RectPoint ePoint;
};
}
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index c666c4353821..233b99441362 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -33,7 +33,7 @@ class EnhancedCustomShape3d final
{
class Transformation2D
{
- Point const aCenter;
+ Point aCenter;
css::drawing::ProjectionMode eProjectionMode;
// parallel projection
@@ -41,7 +41,7 @@ class EnhancedCustomShape3d final
double fSkew; // in percent
// perspective projection
- basegfx::B3DPoint fViewPoint;
+ basegfx::B3DPoint fViewPoint;
double fOriginX;
double fOriginY;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index cecc478ae66e..2ef6b040e6ce 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -94,7 +94,7 @@ namespace
class ConstantValueExpression : public ExpressionNode
{
- double const maValue;
+ double maValue;
public:
@@ -1099,7 +1099,7 @@ public:
}
private:
- ParserContextSharedPtr const mpParserContext; // might get modified during parsing
+ ParserContextSharedPtr mpParserContext; // might get modified during parsing
};
const ParserContextSharedPtr& getParserContext()
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 831d47ab43f8..0fa64bbe4bcd 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -32,7 +32,7 @@ class EnhancedCustomShapeHandle : public cppu::WeakImplHelper
css::lang::XInitialization
>
{
- sal_uInt32 const mnIndex;
+ sal_uInt32 mnIndex;
css::uno::Reference< css::drawing::XShape > mxCustomShape;
public:
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 4b257d9ffb7e..d97a73a7c52e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -36,7 +36,7 @@ namespace {
struct NameTypeTable
{
const char* pS;
- MSO_SPT const pE;
+ MSO_SPT pE;
};
}
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 3c4b8d3b3724..dd8081bf3f11 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -189,8 +189,8 @@ struct ArrayImpl
std::vector<long> maHeights;
mutable std::vector<long> maXCoords;
mutable std::vector<long> maYCoords;
- size_t const mnWidth;
- size_t const mnHeight;
+ size_t mnWidth;
+ size_t mnHeight;
size_t mnFirstClipCol;
size_t mnFirstClipRow;
size_t mnLastClipCol;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 10357d49f944..7af720d51c63 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -736,7 +736,7 @@ public:
}
private:
SvxSearchDialog& mrDialog;
- bool const mbValue;
+ bool mbValue;
};
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 55a1b10f2c24..c0c7ce19beb1 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -131,7 +131,7 @@ class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
osl::Mutex m_aMutex;
DbGridControl& m_rParent;
rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pRealListener;
- sal_uInt16 const m_nId;
+ sal_uInt16 m_nId;
sal_Int16 m_nSuspended;
bool m_bDisposed : 1;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 820315e0330d..4296f73f1a8d 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -176,7 +176,7 @@ namespace {
class FmFilterHint : public SfxHint
{
- FmFilterData* const m_pData;
+ FmFilterData* m_pData;
public:
explicit FmFilterHint(FmFilterData* pData):m_pData(pData){}
@@ -185,7 +185,7 @@ public:
class FmFilterInsertedHint : public FmFilterHint
{
- size_t const m_nPos; // Position relative to the parent of the data
+ size_t m_nPos; // Position relative to the parent of the data
public:
FmFilterInsertedHint(FmFilterData* pData, size_t nRelPos)
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index 16bde8e94857..43e485d3cd9a 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -77,8 +77,8 @@ namespace svxform
struct ModuleInfo
{
- const char* pAsciiModuleOrServiceName;
- DocumentType const eType;
+ const char* pAsciiModuleOrServiceName;
+ DocumentType eType;
};
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index f7827df23e3d..499d2cb16760 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -78,7 +78,7 @@ namespace svxform
struct Ascii2Int16
{
const char* pAscii;
- sal_Int16 const nValue;
+ sal_Int16 nValue;
};
}
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 46aca133dbae..a73c161488c8 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -68,9 +68,9 @@ namespace svx
{
struct FeatureDescription
{
- OUString const sURL; // the URL
- sal_Int32 const nSlotId; // the SFX-compatible slot ID
- sal_Int16 const nFormFeature; // the css.form.runtime.FormFeature ID
+ OUString sURL; // the URL
+ sal_Int32 nSlotId; // the SFX-compatible slot ID
+ sal_Int16 nFormFeature; // the css.form.runtime.FormFeature ID
};
typedef ::std::vector< FeatureDescription > FeatureDescriptions;
@@ -121,7 +121,7 @@ namespace svx
struct MatchFeatureDescriptionBySlotId
{
- sal_Int32 const m_nSlotId;
+ sal_Int32 m_nSlotId;
explicit MatchFeatureDescriptionBySlotId( sal_Int32 _nSlotId ) :m_nSlotId( _nSlotId ) { }
bool operator()( const FeatureDescription& _compare )
@@ -133,7 +133,7 @@ namespace svx
struct MatchFeatureDescriptionByFormFeature
{
- sal_Int32 const m_nFormFeature;
+ sal_Int32 m_nFormFeature;
explicit MatchFeatureDescriptionByFormFeature( sal_Int32 _nFormFeature ) :m_nFormFeature( _nFormFeature ) { }
bool operator()( const FeatureDescription& _compare )
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 4c9dec977c2f..d0470b471bdd 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -60,7 +60,7 @@ using namespace ::dbtools;
struct ColumnInfo
{
- OUString const sColumnName;
+ OUString sColumnName;
explicit ColumnInfo(const OUString& i_sColumnName)
: sColumnName(i_sColumnName)
{
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 6cd5963374f4..3164aadcbb3b 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -54,7 +54,7 @@ private:
OUString aImgDefault;
OUString aImgReadOnly;
- ::std::function<void ()> const maThemeSlectionHandler;
+ ::std::function<void ()> maThemeSlectionHandler;
void ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
static void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 42856a8f030d..7a7179bd9c03 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -94,8 +94,8 @@ class GalleryThemePopup : public ::cppu::WeakImplHelper< css::frame::XStatusList
{
private:
const GalleryTheme* mpTheme;
- sal_uInt32 const mnObjectPos;
- bool const mbPreview;
+ sal_uInt32 mnObjectPos;
+ bool mbPreview;
std::unique_ptr<weld::Builder> mxBuilder;
std::unique_ptr<weld::Menu> mxPopupMenu;
std::unique_ptr<weld::Menu> mxBackgroundPopup;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 8dfd19675c95..26f30aa6726b 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -125,7 +125,7 @@ private:
FrameSelector* mpFrameSel;
- FrameBorderType const meBorder;
+ FrameBorderType meBorder;
};
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 6ce383ad923a..71bcc63a4e88 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -45,7 +45,7 @@ namespace svx
struct SvxShowCharSetItem
{
SvxShowCharSet& mrParent;
- sal_uInt16 const mnId;
+ sal_uInt16 mnId;
OUString maText;
tools::Rectangle maRect;
rtl::Reference<SvxShowCharSetItemAcc> m_xItem;
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index a948c5e9190b..1b679c39a613 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -210,8 +210,8 @@ namespace svxform
class XFormsPage : public TabPage
{
private:
- MethodString const m_aMethodString;
- ReplaceString const m_aReplaceString;
+ MethodString m_aMethodString;
+ ReplaceString m_aReplaceString;
VclPtr<ToolBox> m_pToolBox;
VclPtr<DataTreeListBox> m_pItemList;
@@ -226,7 +226,7 @@ namespace svxform
VclPtr<DataNavigatorWindow> m_pNaviWin;
bool m_bHasModel;
- DataGroupType const m_eGroup;
+ DataGroupType m_eGroup;
// these strings are not valid on the Submission and Binding Page
// mb: furthermore these are properties of an instance, thus
// it would be much better to get/set them through the UIHelper
@@ -388,10 +388,10 @@ namespace svxform
ItemNode* m_pItemNode;
DataItemType m_eItemType;
- OUString const m_sFL_Element;
- OUString const m_sFL_Attribute;
- OUString const m_sFL_Binding;
- OUString const m_sFT_BindingExp;
+ OUString m_sFL_Element;
+ OUString m_sFL_Attribute;
+ OUString m_sFL_Binding;
+ OUString m_sFT_BindingExp;
std::unique_ptr<weld::Frame> m_xItemFrame;
std::unique_ptr<weld::Label> m_xNameFT;
@@ -436,7 +436,7 @@ namespace svxform
{
private:
Idle m_aResultIdle;
- OUString const m_sPropertyName;
+ OUString m_sPropertyName;
css::uno::Reference< css::xforms::XFormsUIHelper1 >
m_xUIHelper;
@@ -521,10 +521,10 @@ namespace svxform
class AddSubmissionDialog : public weld::GenericDialogController
{
private:
- MethodString const m_aMethodString;
- ReplaceString const m_aReplaceString;
+ MethodString m_aMethodString;
+ ReplaceString m_aReplaceString;
- ItemNode* const m_pItemNode;
+ ItemNode* m_pItemNode;
css::uno::Reference< css::xforms::XFormsUIHelper1 >
m_xUIHelper;
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 4cda56f98947..4f7925c94b1d 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -61,7 +61,7 @@ namespace svxform
void CancelPendingCall();
private:
- Link<void*,void> const m_aHandler;
+ Link<void*,void> m_aHandler;
ImplSVEvent * m_nEventId;
private:
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index f1002ad08d24..4a954f57b7fa 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -202,7 +202,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener
on the core dispatch implementation, we must know,
which URL we have to use for deregistration!
*/
- bool const m_bListenForSaving;
+ bool m_bListenForSaving;
// native interface
@@ -384,9 +384,9 @@ class RecoveryDialog : public weld::GenericDialogController
{
// member
private:
- OUString const m_aTitleRecoveryInProgress;
- OUString const m_aRecoveryOnlyFinish;
- OUString const m_aRecoveryOnlyFinishDescr;
+ OUString m_aTitleRecoveryInProgress;
+ OUString m_aRecoveryOnlyFinish;
+ OUString m_aRecoveryOnlyFinishDescr;
RecoveryCore* m_pCore;
css::uno::Reference< css::task::XStatusIndicator > m_xProgress;
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index f2da82909840..f0cda9a442a0 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -54,7 +54,7 @@ class FmFilterAdapter;
class FmFilterData
{
- FmParentData* const m_pParent;
+ FmParentData* m_pParent;
OUString m_aText;
public:
@@ -126,8 +126,8 @@ public:
class FmFilterItem : public FmFilterData
{
- OUString const m_aFieldName;
- const sal_Int32 m_nComponentIndex;
+ OUString m_aFieldName;
+ sal_Int32 m_nComponentIndex;
public:
FmFilterItem(
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index bbeff968b63f..51384c8f279e 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -56,8 +56,8 @@ class SdrMarkList;
class FmEntryData;
class FmNavInsertedHint : public SfxHint
{
- FmEntryData* const pEntryData;
- sal_uInt32 const nPos;
+ FmEntryData* pEntryData;
+ sal_uInt32 nPos;
public:
FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos );
@@ -70,7 +70,7 @@ public:
class FmNavModelReplacedHint : public SfxHint
{
- FmEntryData* const pEntryData; // the data of the entry that has got a new model
+ FmEntryData* pEntryData; // the data of the entry that has got a new model
public:
FmNavModelReplacedHint( FmEntryData* pAffectedEntryData );
@@ -82,7 +82,7 @@ public:
class FmNavRemovedHint : public SfxHint
{
- FmEntryData* const pEntryData;
+ FmEntryData* pEntryData;
public:
FmNavRemovedHint( FmEntryData* pInsertedEntryData );
@@ -94,8 +94,8 @@ public:
class FmNavNameChangedHint : public SfxHint
{
- FmEntryData* const pEntryData;
- OUString const aNewName;
+ FmEntryData* pEntryData;
+ OUString aNewName;
public:
FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName );
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 3ca7a3bf2e1d..16cd751d1051 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -161,8 +161,8 @@ class SVXCORE_DLLPUBLIC FmXFormShell final : public FmXFormShell_BASE
FmFormArray m_aSearchForms;
struct SAL_DLLPRIVATE InvalidSlotInfo {
- sal_uInt16 const id;
- sal_uInt8 const flags;
+ sal_uInt16 id;
+ sal_uInt8 flags;
InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {};
};
std::vector<InvalidSlotInfo> m_arrInvalidSlots;
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index 9b31af0a332a..613f17bf5c4a 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -29,7 +29,7 @@ namespace svx
class TextControlCharAttribDialog : public SfxTabDialogController
{
private:
- SvxFontListItem const m_aFontList;
+ SvxFontListItem m_aFontList;
public:
TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, const SvxFontListItem& rFontList);
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index e1e463838e41..0acc884bcd1d 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -40,9 +40,9 @@ namespace svx
private:
css::uno::Reference< css::frame::XDispatch >
m_xDispatcher;
- css::util::URL const m_aFeatureURL;
+ css::util::URL m_aFeatureURL;
css::uno::Any m_aFeatureState;
- SfxSlotId const m_nSlotId;
+ SfxSlotId m_nSlotId;
FmTextControlShell* m_pInvalidator;
bool m_bFeatureEnabled;
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index f5953ec1f7f1..d914a0e74071 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -46,9 +46,9 @@ class SdrObject;
class FmUndoPropertyAction: public SdrUndoAction
{
css::uno::Reference< css::beans::XPropertySet> xObj;
- OUString const aPropertyName;
- css::uno::Any const aNewValue;
- css::uno::Any const aOldValue;
+ OUString aPropertyName;
+ css::uno::Any aNewValue;
+ css::uno::Any aOldValue;
public:
FmUndoPropertyAction(FmFormModel& rMod, const css::beans::PropertyChangeEvent& evt);
@@ -94,7 +94,7 @@ private:
sal_Int32 m_nIndex; // index of the object within it's container
css::uno::Sequence< css::script::ScriptEventDescriptor >
m_aEvents; // events of the object
- Action const m_eAction;
+ Action m_eAction;
};
class FmUndoModelReplaceAction : public SdrUndoAction
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index 73de3d9538d9..dc93489c343c 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -70,7 +70,7 @@ namespace svx
*/
class ControllerFeatures final
{
- IControllerFeatureInvalidation* const m_pInvalidationCallback; // necessary as long as m_pImpl is not yet constructed
+ IControllerFeatureInvalidation* m_pInvalidationCallback; // necessary as long as m_pImpl is not yet constructed
rtl::Reference<FormControllerHelper> m_pImpl;
public:
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 93511576956f..b46582e6f104 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -84,7 +84,7 @@ private:
sal_Int32 m_nFormatKey;
sal_Int16 m_nFieldType;
sal_Int16 m_nTypeId;
- sal_uInt16 const m_nId;
+ sal_uInt16 m_nId;
sal_Int16 m_nFieldPos;
sal_Int16 m_nAlign; // specified with TXT_ALIGN_LEFT...
bool m_bReadOnly : 1;
@@ -533,7 +533,7 @@ private:
class DbSpinField : public DbCellControl
{
private:
- sal_Int16 const m_nStandardAlign;
+ sal_Int16 m_nStandardAlign;
public:
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index f9f3d6a610f1..7610c1407bba 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -91,9 +91,9 @@ private:
SvxPixelCtl& mrParentWindow;
rtl::Reference<SvxPixelCtlAccessible> mxParent;
bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
- tools::Rectangle const maBoundingBox;
+ tools::Rectangle maBoundingBox;
/// index of child in parent
- long const mnIndexInParent;
+ long mnIndexInParent;
};
class SvxPixelCtlAccessible final : public ::comphelper::OAccessibleSelectionHelper,
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 40b2551c9730..9ec7f00d48ac 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -207,25 +207,25 @@ private:
be set from the outside. Furthermore, it changes according to the
draw page's display mode.
*/
- OUString const msDescription;
+ OUString msDescription;
/** Name of this object. It changes according the draw page's
display mode.
*/
- OUString const msName;
+ OUString msName;
/// Reference to the parent object.
css::uno::Reference< css::accessibility::XAccessible >
- mxParent;
+ mxParent;
/// Bounding box
- tools::Rectangle const maBoundingBox;
+ tools::Rectangle maBoundingBox;
/// index of child in parent
- long const mnIndexInParent;
+ long mnIndexInParent;
/// Indicates, if object is checked
- bool mbIsChecked;
+ bool mbIsChecked;
};
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index 73a80f4b6e4a..6010750bfee9 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -47,7 +47,7 @@ private:
{
css::uno::Reference< css::smarttags::XSmartTagAction > m_xAction;
css::uno::Reference< css::container::XStringKeyMap > m_xSmartTagProperties;
- sal_uInt32 const m_nActionID;
+ sal_uInt32 m_nActionID;
InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > const & xAction,
css::uno::Reference< css::container::XStringKeyMap > const & xSmartTagProperties,
sal_uInt32 nActionID ) : m_xAction( xAction ), m_xSmartTagProperties( xSmartTagProperties ), m_nActionID( nActionID ) {}
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index ab6cb0969200..77962bdb71a8 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -146,23 +146,23 @@ namespace drawinglayer::attribute
{
public:
// FormText (FontWork) Attributes
- sal_Int32 const mnFormTextDistance; // distance from line in upright direction
- sal_Int32 const mnFormTextStart; // shift from polygon start
- sal_Int32 const mnFormTextShdwXVal; // shadow distance or 10th degrees
- sal_Int32 const mnFormTextShdwYVal; // shadow distance or scaling
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list