diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-13 10:40:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-13 19:21:28 +0100 |
| commit | b4cb9bc2b80e316ff615e14c4a5ae2a1ab492f91 (patch) | |
| tree | 3bde5c701091b9ec1dd02ffbeed5ab621514a247 /include | |
| parent | df3e1b7bbd126ed114015070bf68db30fbe9516e (diff) | |
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@collabora.co.uk>
Diffstat (limited to 'include')
48 files changed, 141 insertions, 141 deletions
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; |