diff options
110 files changed, 279 insertions, 283 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 4d2bbad231f2..c18d1437e730 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -253,7 +253,7 @@ private: double mfGroupingAuto; sal_Int32 mnLastPara; sal_Int8 mnDepthFlags[PARA_LEVELS]; - sal_Int32 mnGroupId; + sal_Int32 const mnGroupId; }; typedef std::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr; diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index 85318c9c4c2a..eeeeac55ad77 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -73,7 +73,7 @@ typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList; struct PresetCategory { - OUString maLabel; + OUString const maLabel; EffectDescriptorList maEffects; PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects ) diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 0dfe8890ee00..32e2b21cfa88 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -45,12 +45,12 @@ class Window; struct SearchSelection { /// 0-based index of the page that has the selection. - int m_nPage; + int const m_nPage; /** * List of selection rectangles in twips -- multiple rectangles only in * case the selection spans over more layout lines. */ - OString m_aRectangles; + OString const m_aRectangles; SearchSelection(int nPage, const OString& rRectangles); diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 523eaf640c3a..d9033bbfb8cc 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -193,7 +193,7 @@ public: private: /// The wrapped outliner that is represented as object container. - SdOutliner* mpOutliner; + SdOutliner* const mpOutliner; /** Create an iterator. The object pointed to depends on the search direction retrieved from the outliner object diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx index bb7f61339a95..9d9505c5f0e0 100644 --- a/sd/inc/animations.hxx +++ b/sd/inc/animations.hxx @@ -32,7 +32,7 @@ struct AfterEffectNode { css::uno::Reference< css::animations::XAnimationNode > mxNode; css::uno::Reference< css::animations::XAnimationNode > mxMaster; - bool mbOnNextEffect; + bool const mbOnNextEffect; AfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xMaster, bool bOnNextEffect ) : mxNode( xNode ), mxMaster( xMaster ), mbOnNextEffect( bOnNextEffect ) {} diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index 03dd4fce8783..d6810db45091 100644 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -39,7 +39,7 @@ public: css::presentation::AnimationSpeed meSpeed; ///< Speed of the animation bool mbActive; ///< turned on? bool mbDimPrevious; ///< Object fade out - bool mbIsMovie; ///< if group object than it is a sequence of them. + bool const mbIsMovie; ///< if group object than it is a sequence of them. bool mbDimHide; ///< hide rather than dim Color maBlueScreen; ///< identifies "background pixels" Color maDimColor; ///< for fading the object @@ -49,7 +49,7 @@ public: css::presentation::ClickAction meClickAction; ///< Action at mouse click css::presentation::AnimationEffect meSecondEffect; ///< for object fading. css::presentation::AnimationSpeed meSecondSpeed; ///< for object fading. - OUString maSecondSoundFile; ///< for object fading. + OUString const maSecondSoundFile; ///< for object fading. bool mbSecondSoundOn; ///< for object fading. bool mbSecondPlayFull; ///< for object fading. sal_uInt16 mnVerb; ///< for OLE object diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 92234c49e5c1..4678dfefcfe5 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -175,7 +175,7 @@ private: SvxNumType mePageNumType; ::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel() bool mbAllocDocSh; // => AllocModel() - DocumentType meDocType; + DocumentType const meDocType; std::unique_ptr<CharClass> mpCharClass; diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index dbf6d27a9ff4..17ce09d3647b 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -52,7 +52,7 @@ protected: SfxMedium& mrMedium; ::sd::DrawDocShell& mrDocShell; SdDrawDocument& mrDocument; - bool mbIsDraw : 1; + bool const mbIsDraw : 1; void CreateStatusIndicator(); private: diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index fb1872f16832..8afba8277c2d 100644 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -30,7 +30,7 @@ protected: SvStream& rStream; sal_uInt32 nSubRecSiz; sal_uInt32 nSubRecPos; - StreamMode nMode; + StreamMode const nMode; bool bOpen; protected: diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 8cec945cccaf..ec1efd71a2d0 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -383,7 +383,7 @@ private: bool mbIsPrecious; // page id of this page - sal_uInt16 mnPageId; + sal_uInt16 const mnPageId; /** clone the animations from this and set them to rTargetPage * TTTT: Order is strange, should be the other way around by diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 9bbd2c00a667..a73ce57d22f7 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -46,8 +46,8 @@ public: bool Export() override; private: - SdXMLFilterMode meFilterMode; - sal_uLong mnStoreVer; + SdXMLFilterMode const meFilterMode; + sal_uLong const mnStoreVer; }; #endif // INCLUDED_SD_INC_SDXMLWRP_HXX diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx index 15ae5c6c1d4b..5121bc40c5f7 100644 --- a/sd/inc/undo/undoobjects.hxx +++ b/sd/inc/undo/undoobjects.hxx @@ -108,7 +108,7 @@ public: virtual void Redo() override; private: - SdrObjUserCall* mpOldUserCall; + SdrObjUserCall* const mpOldUserCall; SdrObjUserCall* mpNewUserCall; ::tools::WeakReference<SdrObject> mxSdrObject; }; diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 1b35a3a48a97..e7890a5780d2 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -2680,7 +2680,7 @@ struct ImplStlTextGroupSortHelper { explicit ImplStlTextGroupSortHelper( bool bReverse ) : mbReverse( bReverse ) {}; bool operator()( const CustomAnimationEffectPtr& p1, const CustomAnimationEffectPtr& p2 ); - bool mbReverse; + bool const mbReverse; sal_Int32 getTargetParagraph( const CustomAnimationEffectPtr& p1 ); }; diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 715cf2f6d5a8..626495ed3b7c 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -48,7 +48,7 @@ using ::com::sun::star::beans::NamedValue; struct deprecated_FadeEffect_conversion_table_entry { - FadeEffect meFadeEffect; + FadeEffect const meFadeEffect; const sal_Char* mpPresetId; } @@ -219,7 +219,7 @@ FadeEffect EffectMigration::GetFadeEffect( const SdPage* pPage ) struct deprecated_AnimationEffect_conversion_table_entry { - AnimationEffect meEffect; + AnimationEffect const meEffect; const sal_Char* mpPresetId; const sal_Char* mpPresetSubType; } diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index 45487f233cac..e2190d35c3a3 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -111,7 +111,7 @@ private: // disposed, do it here. virtual void SAL_CALL disposing() override; - sal_uInt32 m_nId; + sal_uInt32 const m_nId; SdPage* mpPage; RealPoint2D m_Position; RealSize2D m_Size; @@ -131,7 +131,7 @@ public: protected: rtl::Reference< Annotation > mxAnnotation; - bool mbInsert; + bool const mbInsert; int mnIndex; }; diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 682e41840517..61f7c3414711 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -619,7 +619,7 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate { return sheet.GetFamily() == meFamily; } - SfxStyleFamily meFamily; + SfxStyleFamily const meFamily; }; } diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index c2470057c251..8b4a095b3482 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -576,8 +576,8 @@ namespace { struct ApiNameMap { - OUStringLiteral mpApiName; - sal_uInt32 mnHelpId; + OUStringLiteral const mpApiName; + sal_uInt32 const mnHelpId; } const pApiNameMap[] = { { OUStringLiteral("title"), HID_PSEUDOSHEET_TITLE }, { OUStringLiteral("subtitle"), HID_PSEUDOSHEET_SUBTITLE }, diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 7699c09158fe..f3fcfe4be1fe 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -63,8 +63,8 @@ class SotStorage; struct EPPTHyperlink { - OUString aURL; - sal_uInt32 nType; // bit 0-7 : type ( 1: click action to a slide ) + OUString const aURL; + sal_uInt32 const nType; // bit 0-7 : type ( 1: click action to a slide ) // ( 2: hyperlink url ) // bit 8-23: index // bit 31 : hyperlink is attached to a shape @@ -81,8 +81,8 @@ enum PPTExOleObjEntryType struct PPTExOleObjEntry { - PPTExOleObjEntryType eType; - sal_uInt32 nOfsA; ///< offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation) + PPTExOleObjEntryType const eType; + sal_uInt32 const nOfsA; ///< offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation) sal_uInt32 nOfsB; ///< offset to the EPP_ExOleObjStg css::uno::Reference< css::awt::XControlModel > xControlModel; @@ -112,7 +112,7 @@ public: struct CellBorder; class PPTWriter final : public PPTWriterBase, public PPTExBulletProvider { - sal_uInt32 mnCnvrtFlags; + sal_uInt32 const mnCnvrtFlags; bool mbStatus; sal_uInt32 mnStatMaxValue; sal_uInt32 mnLatestStatValue; diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 6e627f3aa9ca..d57ecfee00ed 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -77,7 +77,7 @@ enum class EppLayout struct PHLayout { EppLayout nLayout; - sal_uInt8 nPlaceHolder[ 8 ]; + sal_uInt8 nPlaceHolder[ 8 ]; sal_uInt8 nUsedObjectPlaceHolder; sal_uInt8 nTypeOfTitle; @@ -146,7 +146,7 @@ struct FontCollectionEntry sal_Int16 Pitch; sal_Int16 CharSet; - OUString Original; + OUString const Original; FontCollectionEntry( const OUString& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) : Scaling ( 1.0 ), @@ -344,9 +344,9 @@ protected: sal_uInt32 mnPages; ///< number of Slides ( w/o master pages & notes & handout ) sal_uInt32 mnMasterPages; - Fraction maFraction; - MapMode maMapModeSrc; - MapMode maMapModeDest; + Fraction const maFraction; + MapMode const maMapModeSrc; + MapMode const maMapModeDest; css::awt::Size maDestPageSize; css::awt::Size maPageSize; // #i121183# Keep size in logic coordinates (100th mm) css::awt::Size maNotesPageSize; diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 4d3d2cf50535..5eabb246d498 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -1549,7 +1549,7 @@ sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const OUString& rAtt struct Entry { const sal_Char* pName; - sal_uInt8 nType; + sal_uInt8 nType; }; static const Entry lcl_attributeMap[] = { diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index a104cd4a7eb3..55ada15931ac 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -35,7 +35,7 @@ namespace ppt class ExSoundEntry { sal_uInt32 nFileSize; - OUString aSoundURL; + OUString const aSoundURL; OUString ImplGetName() const; OUString ImplGetExtension() const; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 74c852b103a3..503489f21ce6 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -148,7 +148,7 @@ enum PPTXLayout struct PPTXLayoutInfo { - int nType; + int const nType; const char* sName; const char* sType; }; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index a9377b468e1a..13dd08e1607b 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -342,11 +342,13 @@ void lclAppendStyle(OUStringBuffer& aBuffer, const OUString& aTag, const OUStrin } // anonymous namespace -static const OUStringLiteral gaHTMLHeader( +static constexpr OUStringLiteral gaHTMLHeader( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n" " \"http://www.w3.org/TR/html4/transitional.dtd\">\r\n" "<html>\r\n<head>\r\n" ); +static constexpr OUStringLiteral gaHTMLExtension = STR_HTMLEXP_DEFAULT_EXTENSION; + // constructor for the html export helper classes HtmlExport::HtmlExport( const OUString& aPath, @@ -371,14 +373,13 @@ HtmlExport::HtmlExport( maTextColor(COL_BLACK), maBackColor(COL_WHITE), mbDocColors(false), - maHTMLExtension(STR_HTMLEXP_DEFAULT_EXTENSION), maIndexUrl("index"), meScript( SCRIPT_ASP ), mpButtonSet( new ButtonSet() ) { bool bChange = mpDoc->IsChanged(); - maIndexUrl += maHTMLExtension; + maIndexUrl += gaHTMLExtension; InitExportParameters( rParams ); @@ -1163,7 +1164,7 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const OUString aFileName( rFileName ); if( bAddExtension ) - aFileName += maHTMLExtension; + aFileName += gaHTMLExtension; meEC.SetContext( STR_HTMLEXP_ERROR_CREATE_FILE, rFileName ); EasyFile aFile; @@ -2159,7 +2160,7 @@ void HtmlExport::CreateFileNames() aHTMLFileName = maIndex; else { - aHTMLFileName = "img" + OUString::number(nSdPage) + maHTMLExtension; + aHTMLFileName = "img" + OUString::number(nSdPage) + gaHTMLExtension; } maHTMLFiles[nSdPage] = aHTMLFileName; @@ -2182,7 +2183,7 @@ void HtmlExport::CreateFileNames() maThumbnailFiles[nSdPage] = aThumbnailFileName; - maTextFiles[nSdPage] = "text" + OUString::number(nSdPage) + maHTMLExtension; + maTextFiles[nSdPage] = "text" + OUString::number(nSdPage) + gaHTMLExtension; SdPage* pSdPage = maPages[ nSdPage ]; @@ -2194,7 +2195,7 @@ void HtmlExport::CreateFileNames() maFramePage = maIndex; else { - maFramePage = "siframes" + maHTMLExtension; + maFramePage = "siframes" + gaHTMLExtension; } } @@ -2314,21 +2315,21 @@ bool HtmlExport::CreateFrames() // substitute HTML file extension OUString aPlaceHolder(".$EXT"); - aFunction = aFunction.replaceAll(aPlaceHolder, maHTMLExtension); + aFunction = aFunction.replaceAll(aPlaceHolder, gaHTMLExtension); aStr.append(aFunction); aTmp = JS_NavigateRel; - aTmp = aTmp.replaceAll(aPlaceHolder, maHTMLExtension); + aTmp = aTmp.replaceAll(aPlaceHolder, gaHTMLExtension); aStr.append(aTmp); if(mbImpress) { aTmp = JS_ExpandOutline; - aTmp = aTmp.replaceAll(aPlaceHolder, maHTMLExtension); + aTmp = aTmp.replaceAll(aPlaceHolder, gaHTMLExtension); aStr.append(aTmp); aTmp = JS_CollapseOutline; - aTmp = aTmp.replaceAll(aPlaceHolder, maHTMLExtension); + aTmp = aTmp.replaceAll(aPlaceHolder, gaHTMLExtension); aStr.append(aTmp); } aStr.append("// -->\r\n</script>\r\n"); @@ -2342,11 +2343,11 @@ bool HtmlExport::CreateFrames() { aStr.append(" <frameset rows=\"42,*\">\r\n"); aStr.append(" <frame src=\"navbar3"); - aStr.append(maHTMLExtension); + aStr.append(gaHTMLExtension); aStr.append("\" name=\"navbar2\" marginwidth=\"4\" marginheight=\"4\" scrolling=\"no\">\r\n"); } aStr.append(" <frame src=\"outline0"); - aStr.append(maHTMLExtension); + aStr.append(gaHTMLExtension); aStr.append("\" name=\"outline\">\r\n"); if(mbImpress) aStr.append(" </frameset>\r\n"); @@ -2361,7 +2362,7 @@ bool HtmlExport::CreateFrames() aStr.append(" <frameset rows=\"42,*\">\r\n"); aStr.append(" <frame src=\"navbar0"); - aStr.append(maHTMLExtension); + aStr.append(gaHTMLExtension); aStr.append("\" name=\"navbar1\" marginwidth=\"4\" marginheight=\"4\" scrolling=\"no\">\r\n"); aStr.append(" <frame src=\""); @@ -2371,7 +2372,7 @@ bool HtmlExport::CreateFrames() if(mbNotes) { aStr.append(" <frame src=\"note0"); - aStr.append(maHTMLExtension); + aStr.append(gaHTMLExtension); aStr.append("\" name=\"notes\">\r\n"); } aStr.append(" </frameset>\r\n"); @@ -2492,7 +2493,7 @@ bool HtmlExport::CreateNavBarFrames() if(mnButtonThema != -1) aButton = CreateImage(GetButtonName(BTN_TEXT), aButton); - OUString aText0("text0" + maHTMLExtension); + OUString aText0("text0" + gaHTMLExtension); aStr.append(CreateLink(aText0, aButton, "_top")); aStr.append("\r\n"); } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 3a3e590621b0..73bdb2665d50 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -79,7 +79,7 @@ class HtmlExport final std::vector< SdPage* > maPages; std::vector< SdPage* > maNotesPages; - OUString maPath; + OUString const maPath; SdDrawDocument* mpDoc; ::sd::DrawDocShell* mpDocSh; @@ -125,7 +125,6 @@ class HtmlExport final Color maFirstPageColor; bool mbDocColors; - OUString maHTMLExtension; std::vector<OUString> maHTMLFiles; std::vector<OUString> maImageFiles; std::vector<OUString> maThumbnailFiles; diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index a177c443da3c..950623bda5e3 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -67,7 +67,7 @@ private: Atom( const DffRecordHeader& rRecordHeader, SvStream& rStCtrl ); SvStream& mrStream; - DffRecordHeader maRecordHeader; + DffRecordHeader const maRecordHeader; Atom* mpFirstChild; Atom* mpNextAtom; }; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index b1e03f4452f3..7ce429ece102 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -107,7 +107,7 @@ private: std::map< sal_uInt16, OUString > maPropertyValues; VclPtr<ListBox> mpControl; DECL_LINK(OnSelect, ListBox&, void); - Link<LinkParamNone*,void> maModifyLink; + Link<LinkParamNone*,void> const maModifyLink; }; PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl ) @@ -188,7 +188,7 @@ public: private: VclPtr<SvxColorListBox> mpControl; DECL_LINK(OnSelect, SvxColorListBox&, void); - Link<LinkParamNone*,void> maModifyLink; + Link<LinkParamNone*,void> const maModifyLink; }; ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl ) @@ -249,7 +249,7 @@ public: private: VclPtr<FontNameBox> mpControl; - Link<LinkParamNone*,void> maModifyHdl; + Link<LinkParamNone*,void> const maModifyHdl; DECL_LINK(ControlSelectHdl, ComboBox&, void); }; @@ -417,7 +417,7 @@ private: VclPtr<DropdownMenuBox> mpControl; VclPtr<PopupMenu> mpMenu; VclPtr<MetricField> mpMetric; - Link<LinkParamNone*,void> maModifyHdl; + Link<LinkParamNone*,void> const maModifyHdl; }; CharHeightPropertyBox::CharHeightPropertyBox(sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) @@ -497,7 +497,7 @@ private: VclPtr<DropdownMenuBox> mpControl; VclPtr<PopupMenu> mpMenu; VclPtr<MetricField> mpMetric; - Link<LinkParamNone*,void> maModifyHdl; + Link<LinkParamNone*,void> const maModifyHdl; }; TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl ) @@ -597,7 +597,7 @@ private: VclPtr<DropdownMenuBox> mpControl; VclPtr<PopupMenu> mpMenu; VclPtr<MetricField> mpMetric; - Link<LinkParamNone*,void> maModifyHdl; + Link<LinkParamNone*,void> const maModifyHdl; }; RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl ) @@ -716,7 +716,7 @@ private: VclPtr<DropdownMenuBox> mpControl; VclPtr<PopupMenu> mpMenu; VclPtr<MetricField> mpMetric; - Link<LinkParamNone*,void> maModifyHdl; + Link<LinkParamNone*,void> const maModifyHdl; int mnDirection; }; @@ -893,7 +893,7 @@ private: VclPtr<DropdownMenuBox> mpControl; VclPtr<PopupMenu> mpMenu; VclPtr<Edit> mpEdit; - Link<LinkParamNone*,void> maModifyHdl; + Link<LinkParamNone*,void> const maModifyHdl; float mfFontWeight; awt::FontSlant meFontSlant; diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 6aaf713cfaea..8f19c1d6005f 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -115,7 +115,7 @@ public: sal_Int32 getControlType() const { return mnType; } protected: - sal_Int32 mnType; + sal_Int32 const mnType; }; class PropertyControl : public ListBox diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index c896d0003587..a1cb53c31431 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -217,9 +217,9 @@ public: const SvViewDataEntry* pView,const SvTreeListEntry& rEntry) override; private: VclPtr<CustomAnimationList> mpParent; - OUString msDescription; + OUString const msDescription; OUString msEffectName; - CustomAnimationEffectPtr mpEffect; + CustomAnimationEffectPtr const mpEffect; static const long nIconWidth = 19; static const long nItemMinHeight = 38; }; @@ -348,7 +348,7 @@ public: const CustomAnimationEffectPtr& getEffect() const { return mpEffect; } private: - CustomAnimationEffectPtr mpEffect; + CustomAnimationEffectPtr const mpEffect; }; CustomAnimationListEntry::CustomAnimationListEntry() @@ -371,7 +371,7 @@ public: const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; private: - OUString msDescription; + OUString const msDescription; static const long nIconWidth = 19; }; diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 98fd0fc6da5f..abc84f5910fe 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -163,12 +163,12 @@ private: OUString maStrProperty; sal_Int32 mnPropertyType; - sal_Int32 mnMotionPathPos; + sal_Int32 const mnMotionPathPos; sal_Int32 mnCurvePathPos; sal_Int32 mnPolygonPathPos; sal_Int32 mnFreeformPathPos; - bool mbHorizontal; + bool const mbHorizontal; EffectSequence maListSelection; css::uno::Any maViewSelection; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index f7a01f67643b..a1be17fa8449 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -283,7 +283,7 @@ struct lcl_EqualsSoundFileName } private: - OUString maStr; + OUString const maStr; }; // returns -1 if no object was found diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 0b8701956796..10ef7cfab409 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -72,7 +72,7 @@ static const int DRGPIX = 2; // Drag MinMove i class PathDragMove : public SdrDragMove { private: - basegfx::B2DPolyPolygon maPathPolyPolygon; + basegfx::B2DPolyPolygon const maPathPolyPolygon; protected: virtual void createSdrDragEntries() override; @@ -135,7 +135,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) class PathDragResize : public SdrDragResize { private: - basegfx::B2DPolyPolygon maPathPolyPolygon; + basegfx::B2DPolyPolygon const maPathPolyPolygon; protected: virtual void createSdrDragEntries() override; @@ -194,7 +194,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) class PathDragObjOwn : public SdrDragObjOwn { private: - basegfx::B2DPolyPolygon maPathPolyPolygon; + basegfx::B2DPolyPolygon const maPathPolyPolygon; protected: virtual void createSdrDragEntries() override; @@ -253,7 +253,7 @@ public: virtual bool isMarkable() const override; private: - SdrPathObj* mpPathObj; + SdrPathObj* const mpPathObj; }; SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj ) diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 3f5870227269..f2fe252cd761 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -79,8 +79,8 @@ private: AnnotationManagerImpl& mrManager; css::uno::Reference< css::office::XAnnotation > mxAnnotation; VclPtr<AnnotationWindow> mpAnnotationWindow; - Color maColor; - int mnIndex; + Color const maColor; + int const mnIndex; const vcl::Font& mrFont; Size maSize; ImplSVEvent * mnClosePopupEvent; diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 1cc15f36b1e8..b4767b08be86 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -82,7 +82,7 @@ class AnnotationWindow : public FloatingWindow std::unique_ptr<::Outliner> mpOutliner; VclPtr<ScrollBar> mpVScrollbar; css::uno::Reference< css::office::XAnnotation > mxAnnotation; - bool mbReadonly; + bool const mbReadonly; bool mbProtected; bool mbMouseOverButton; VclPtr<AnnotationTextWindow> mpTextWindow; diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index cfa7e70f7d29..752f38d4b9bc 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -69,7 +69,7 @@ private: struct snewfoil_value_info { - sal_uInt16 mnId; + sal_uInt16 const mnId; const char* msBmpResId; const char* mpStrResId; const char* msUnoCommand; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index de4b927bb8a5..611920043515 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -70,7 +70,7 @@ protected: void SelectHdl(void const *); private: SlideLayoutController& mrController; - bool mbInsertPage; + bool const mbInsertPage; VclPtr<ValueSet> mpLayoutSet1; VclPtr<ValueSet> mpLayoutSet2; }; @@ -79,7 +79,7 @@ struct snewfoil_value_info_layout { const char* msBmpResId; const char* mpStrResId; - AutoLayout maAutoLayout; + AutoLayout const maAutoLayout; }; static const snewfoil_value_info_layout notes[] = diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index e1100a345f5b..6ce40b056548 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -54,8 +54,8 @@ public: msContentIdentifier(rsContentIdentifier), mxFolderEnvironment(rxFolderEnvironment) { } - int mnPriority; - OUString msContentIdentifier; + int const mnPriority; + OUString const msContentIdentifier; // Reference<sdbc::XResultSet> mxFolderResultSet; Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 318688a8aec6..3fa82c9f2f9e 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -91,8 +91,8 @@ namespace sd const int nDateTimeFormatsCount = 12; struct DateAndTimeFormat { - SvxDateFormat meDateFormat; - SvxTimeFormat meTimeFormat; + SvxDateFormat const meDateFormat; + SvxTimeFormat const meTimeFormat; }; DateAndTimeFormat const nDateTimeFormats[nDateTimeFormatsCount] = { @@ -144,7 +144,7 @@ private: SdDrawDocument* mpDoc; LanguageType meOldLanguage; - bool mbHandoutMode; + bool const mbHandoutMode; DECL_LINK( UpdateOnClickHdl, Button*, void ); DECL_LINK( LanguageChangeHdl, ListBox&, void ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index e98cde3faa1e..95f85579a746 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -71,12 +71,12 @@ public: IconProvider(); // Regular icons. - Image maImgPage; - Image maImgPageExcl; - Image maImgPageObjsExcl; - Image maImgPageObjs; - Image maImgObjects; - Image maImgGroup; + Image const maImgPage; + Image const maImgPageExcl; + Image const maImgPageObjsExcl; + Image const maImgPageObjs; + Image const maImgObjects; + Image const maImgGroup; }; bool SdPageObjsTLB::bIsInDrag = false; diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index d8ed1dda4f62..b8a5db883af8 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -84,7 +84,7 @@ public: const css::lang::EventObject& rEvent) override; private: - sal_uInt16 mnChildWindowId; + sal_uInt16 const mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::unique_ptr<SfxShell> mpShell; diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 5a4af572f1af..9e582fa0078d 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -100,10 +100,10 @@ public: virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) override; private: - OUString msEventType; + OUString const msEventType; Reference<XConfigurationController> mxConfigurationController; - ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter maFilter; - ::sd::framework::FrameworkHelper::Callback maCallback; + ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter const maFilter; + ::sd::framework::FrameworkHelper::Callback const maCallback; }; //----- LifetimeController ---------------------------------------------------- diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 9b3294fcab8f..fd8b42f7161f 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -126,7 +126,7 @@ private: virtual void implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; - ::sd::ViewShell* mpSdViewSh; + ::sd::ViewShell* const mpSdViewSh; /** This object manages the shapes of the represented draw page. It is responsible to determine the visible shapes and create on demand the diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index b1374783f6d5..a1c221c0c369 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -168,7 +168,7 @@ public: private: css::uno::Reference<css::accessibility::XAccessible> mxParent; - sal_uInt16 mnPageNumber; + sal_uInt16 const mnPageNumber; ::sd::slidesorter::SlideSorter& mrSlideSorter; sal_uInt32 mnClientId; diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 4a32cdd6be8d..392f94b85487 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -82,7 +82,7 @@ public: virtual Size LogicToPixel (const Size& rSize) const override; private: - SdrPaintView* mpView; + SdrPaintView* const mpView; sal_uInt16 mnWindowId; AccessibleViewForwarder (AccessibleViewForwarder&) = delete; diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 408ccd989a9c..a83f7043ac68 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -29,7 +29,7 @@ class ViewShell; class Client : public SfxInPlaceClient { - ViewShell* mpViewShell; + ViewShell* const mpViewShell; SdrOle2Obj* pSdrOle2Obj; virtual void ObjectAreaChanged() override; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 0c73fdadbc89..84d6d277e40a 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -210,12 +210,12 @@ protected: ::sd::ViewShell* mpViewShell; std::unique_ptr<FontList> mpFontList; rtl::Reference<FuPoor> mxDocShellFunction; - DocumentType meDocType; + DocumentType const meDocType; SfxStyleFamily mnStyleFamily; o3tl::array_view<sal_uInt16 const> mpFilterSIDs; bool mbFilterEnable; - bool mbSdDataObj; + bool const mbSdDataObj; bool mbInDestruction; bool mbOwnPrinter; diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index f1578bed321b..caffc7b0363a 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -120,7 +120,7 @@ namespace sd { namespace tools { class EventMultiplexerEvent { public: - EventMultiplexerEventId meEventId; + EventMultiplexerEventId const meEventId; const void* mpUserData; EventMultiplexerEvent ( diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index 48d59cbd1f7a..73e753a35209 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -48,7 +48,7 @@ private: static void InitInterface_Impl(); ::sd::View* mpView; - ViewShell* mpViewSh; + ViewShell* const mpViewSh; }; } // end of namespace sd diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 42ece6d72640..8bbef2859690 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -103,7 +103,7 @@ public: ET_MASTER_PAGE_REMOVED }; - EventType meType; + EventType const meType; const OUString& mrMasterPageName; MasterPageObserverEvent ( diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index 8a2b26967c52..704462fe668c 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -50,7 +50,7 @@ private: static void InitInterface_Impl(); ::sd::View* mpView; - ViewShell* mpViewSh; + ViewShell* const mpViewSh; }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 37194258634f..5dbbd4bc53a0 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -204,7 +204,7 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::unique_ptr<OutlineViewModelChangeGuard, o3tl::default_delete<OutlineViewModelChangeGuard>> maDragAndDropModelGuard; - SvxLRSpaceItem maLRSpaceItem; + SvxLRSpaceItem const maLRSpaceItem; Image maSlideImage; }; diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index 4b6be214dde4..88962404848c 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -35,9 +35,9 @@ namespace sd struct ClientInfo { - OUString mName; + OUString const mName; - bool mbIsAlreadyAuthorised; + bool const mbIsAlreadyAuthorised; enum PROTOCOL { NETWORK = 1, BLUETOOTH }; ClientInfo( const OUString& rName, diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index e584501e921b..3bdb16ddee55 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -108,7 +108,7 @@ private: DECL_LINK(LateInitCallback, Timer *, void); ViewShellBase & mrBase; - SdDrawDocument * mpDrawDoc; + SdDrawDocument * const mpDrawDoc; VclPtr<ValueSet> mpVS_TRANSITION_ICONS; VclPtr<FixedText> mpFT_VARIANT; @@ -131,7 +131,7 @@ private: bool mbHasSelection; bool mbUpdatingControls; bool mbIsMainViewChangePending; - bool mbHorizontalLayout; + bool const mbHorizontalLayout; std::vector<OUString> maSoundList; mutable OUString maCurrentSoundFile; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 14ab85740ac8..552159e0b89a 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -47,8 +47,8 @@ public: TemplateEntry (const OUString& rsTitle, const OUString& rsPath) : msTitle(rsTitle), msPath(rsPath) {} - OUString msTitle; - OUString msPath; + OUString const msTitle; + OUString const msPath; }; /** This class scans the template folders for impress templates. There are diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index dbbd3d3d0d03..574982dcda50 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -50,7 +50,7 @@ public: HintId GetHintId() const { return meHintId;} private: - HintId meHintId; + HintId const meHintId; }; } // end of namespace sd diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index dd6da82c8499..000e75151d03 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -45,8 +45,8 @@ public: private: const SfxItemSet& mrOutAttrs; - Fraction maUIScale; - ::sd::View* mpView; + Fraction const maUIScale; + ::sd::View* const mpView; std::unique_ptr<weld::SpinButton> m_xNumFldCopies; std::unique_ptr<weld::Button> m_xBtnSetViewData; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 0b5ebede9542..238c9737c15a 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -38,7 +38,7 @@ class SdSnapLineDlg : public weld::GenericDialogController private: int nXValue; int nYValue; - Fraction aUIScale; + Fraction const aUIScale; std::unique_ptr<weld::Label> m_xFtX; std::unique_ptr<weld::MetricSpinButton> m_xMtrFldX; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 0895431e9687..8ebb6340bbcf 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -136,7 +136,7 @@ private: css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster> mxBroadcaster; - bool mbBroadcastRequestEvents; + bool const mbBroadcastRequestEvents; /** This private variant of the constructor is used for cloning a Configuration object. diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index 2f599fa7fd07..b91b85da72dd 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -44,7 +44,7 @@ private: SfxRequest& rReq, bool replaceExistingImage); - bool mbReplaceExistingImage; + bool const mbReplaceExistingImage; }; /************************************************************************/ diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index af2c47ca14bf..187cd6b102bf 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -33,7 +33,7 @@ private: VclPtr<CheckBox> m_pCbxLink; VclPtr<CheckBox> m_pCbxMasters; - SfxMedium* pMedium; + SfxMedium* const pMedium; const SdDrawDocument* mpDoc; const OUString& rName; diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index e86d5dc6469f..e144f655a249 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -54,7 +54,7 @@ private: sal_uInt16 mnTextAtt; sal_uInt16 mnBackground; - PresentationObjects ePO; + PresentationObjects const ePO; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index fccba2ac93cf..5f4a1d77195c 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -92,9 +92,9 @@ public: static SotClipboardFormatId mnListBoxDropFormatId; SdPageObjsTLB& mrParent; - INetBookmark maBookmark; + INetBookmark const maBookmark; ::sd::DrawDocShell& mrDocShell; - NavigatorDragType meDragType; + NavigatorDragType const meDragType; SAL_DLLPRIVATE virtual ~SdPageObjsTransferable() override; SAL_DLLPRIVATE virtual void AddSupportedFormats() override; @@ -124,8 +124,8 @@ private: SdDrawDocument* mpBookmarkDoc; SfxMedium* mpMedium; SfxMedium* mpOwnMedium; - Image maImgOle; - Image maImgGraphic; + Image const maImgOle; + Image const maImgGraphic; bool mbLinkableSelected; OUString maDocName; ::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index f3f4da1337d8..33cafba9d536 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -131,7 +131,7 @@ private: bool mbInternalMove : 1; bool mbOwnDocument : 1; bool mbOwnView : 1; - bool mbLateInit : 1; + bool const mbLateInit : 1; bool mbPageTransferable : 1; bool mbPageTransferablePersistent : 1; ::std::vector<std::shared_ptr<UserData> > maUserData; diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index c723c5449f04..8cb23749ec2e 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -190,7 +190,7 @@ private: SlideShow(const SlideShow&) = delete; SlideShow& operator=( const SlideShow& ) = delete; - SvxItemPropertySet maPropSet; + SvxItemPropertySet const maPropSet; rtl::Reference< SlideshowImpl > mxController; /** This flag is used together with mxController.is() to prevent diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index d5ec7fa79eae..d65e04c35dfd 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -170,7 +170,7 @@ public: virtual bool isMarkable() const; protected: - SmartTagReference mxSmartTag; + SmartTagReference const mxSmartTag; }; } // end of namespace sd diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index 48af4ee65759..ac4932aa9123 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -34,15 +34,15 @@ class SdTabTemplateDlg : public SfxStyleDialog { private: const SfxObjectShell& rDocShell; - SdrView* pSdrView; + SdrView* const pSdrView; - XColorListRef pColorList; - XGradientListRef pGradientList; - XHatchListRef pHatchingList; - XBitmapListRef pBitmapList; - XPatternListRef pPatternList; - XDashListRef pDashList; - XLineEndListRef pLineEndList; + XColorListRef const pColorList; + XGradientListRef const pGradientList; + XHatchListRef const pHatchingList; + XBitmapListRef const pBitmapList; + XPatternListRef const pPatternList; + XDashListRef const pDashList; + XLineEndListRef const pLineEndList; sal_uInt16 m_nLineId; sal_uInt16 m_nAreaId; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 95dedec19a15..e96aa05e3675 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -71,7 +71,7 @@ private: object when its task has been executed completely. */ std::shared_ptr<TimerBasedTaskExecution> mpSelf; - sal_uInt32 mnMaxTimePerStep; + sal_uInt32 const mnMaxTimePerStep; TimerBasedTaskExecution ( const std::shared_ptr<AsynchronousTask>& rpTask, diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index 68f4511d0379..6e6b64295def 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -39,19 +39,19 @@ public: virtual void Redo() override; private: - SdrLayer* mpLayer; - OUString maOldLayerName; - OUString maOldLayerTitle; - OUString maOldLayerDesc; - bool mbOldIsVisible; - bool mbOldIsLocked; - bool mbOldIsPrintable; - OUString maNewLayerName; - OUString maNewLayerTitle; - OUString maNewLayerDesc; - bool mbNewIsVisible; - bool mbNewIsLocked; - bool mbNewIsPrintable; + SdrLayer* const mpLayer; + OUString const maOldLayerName; + OUString const maOldLayerTitle; + OUString const maOldLayerDesc; + bool const mbOldIsVisible; + bool const mbOldIsLocked; + bool const mbOldIsPrintable; + OUString const maNewLayerName; + OUString const maNewLayerTitle; + OUString const maNewLayerDesc; + bool const mbNewIsVisible; + bool const mbNewIsLocked; + bool const mbNewIsPrintable; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNDOLAYER_HXX diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 0e3f52e48e04..8872059de6b5 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -34,24 +34,24 @@ class SdPageFormatUndoAction : public SdUndoAction { SdPage* mpPage; - Size maOldSize; - sal_Int32 mnOldLeft; - sal_Int32 mnOldRight; - sal_Int32 mnOldUpper; - sal_Int32 mnOldLower; - Orientation meOldOrientation; - sal_uInt16 mnOldPaperBin; - bool mbOldFullSize; - - Size maNewSize; - sal_Int32 mnNewLeft; - sal_Int32 mnNewRight; - sal_Int32 mnNewUpper; - sal_Int32 mnNewLower; - bool mbNewScale; - Orientation meNewOrientation; - sal_uInt16 mnNewPaperBin; - bool mbNewFullSize; + Size const maOldSize; + sal_Int32 const mnOldLeft; + sal_Int32 const mnOldRight; + sal_Int32 const mnOldUpper; + sal_Int32 const mnOldLower; + Orientation const meOldOrientation; + sal_uInt16 const mnOldPaperBin; + bool const mbOldFullSize; + + Size const maNewSize; + sal_Int32 const mnNewLeft; + sal_Int32 const mnNewRight; + sal_Int32 const mnNewUpper; + sal_Int32 const mnNewLower; + bool const mbNewScale; + Orientation const meNewOrientation; + sal_uInt16 const mnNewPaperBin; + bool const mbNewFullSize; public: SdPageFormatUndoAction( SdDrawDocument* pDoc, @@ -109,10 +109,10 @@ class SdPageLRUndoAction : public SdUndoAction { SdPage* mpPage; - sal_Int32 mnOldLeft; - sal_Int32 mnOldRight; - sal_Int32 mnNewLeft; - sal_Int32 mnNewRight; + sal_Int32 const mnOldLeft; + sal_Int32 const mnOldRight; + sal_Int32 const mnNewLeft; + sal_Int32 const mnNewRight; public: SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, @@ -137,10 +137,10 @@ class SdPageULUndoAction : public SdUndoAction { SdPage* mpPage; - sal_Int32 mnOldUpper; - sal_Int32 mnOldLower; - sal_Int32 mnNewUpper; - sal_Int32 mnNewLower; + sal_Int32 const mnOldUpper; + sal_Int32 const mnOldLower; + sal_Int32 const mnNewUpper; + sal_Int32 const mnNewLower; public: SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 2e04e7c4e1aa..c327c937ca34 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -68,7 +68,7 @@ public: private: OUString maOldName; - OUString maNewName; + OUString const maNewName; const OUString maComment; }; diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 944deeca8476..900d9e77f412 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -67,7 +67,7 @@ class SdAnimationPrmsUndoAction : public SdUndoAction sal_uInt16 nOldVerb; sal_uInt16 nNewVerb; - bool bInfoCreated; + bool const bInfoCreated; public: SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 4d4279bff245..da209c5db1c8 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -41,7 +41,7 @@ class SdUnoSearchReplaceDescriptor; class SdUnoSearchReplaceShape : public css::util::XReplaceable { protected: - css::drawing::XDrawPage* mpPage; + css::drawing::XDrawPage* const mpPage; css::uno::Reference< css::text::XTextRange > Search( const css::uno::Reference< css::text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr ); bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 85da96e3b93d..a45d7a9aca64 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -35,8 +35,8 @@ class DrawDocShell; class SdVectorizeDlg : public weld::GenericDialogController { - ::sd::DrawDocShell* m_pDocSh; - Bitmap aBmp; + ::sd::DrawDocShell* const m_pDocSh; + Bitmap const aBmp; Bitmap aPreviewBmp; GDIMetaFile aMtf; diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx index bf27fd02b9bf..3acdaf3fbc8e 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx @@ -58,7 +58,7 @@ namespace sd sal_Int32 aRet, aRead; std::vector<char> aBuffer; int mSocket; - bool usingCSocket; + bool const usingCSocket; }; } diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 2027834c0159..d3551eeccec0 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -50,8 +50,8 @@ namespace sd { struct ClientInfoInternal: ClientInfo { - BufferedStreamSocket *mpStreamSocket; - OUString mPin; + BufferedStreamSocket * const mpStreamSocket; + OUString const mPin; ClientInfoInternal( const OUString& rName, BufferedStreamSocket *pSocket, diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx index a809ebe142a6..8516cf7404fe 100644 --- a/sd/source/ui/remotecontrol/ZeroconfService.hxx +++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx @@ -33,7 +33,7 @@ namespace sd{ { protected: std::string name; - uint port; + uint const port; public: explicit ZeroconfService(const std::string& aname, uint aport) diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 0f623c705a3f..a3c50ad1a044 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -71,8 +71,8 @@ struct snewfoil_value_info { const char* msBmpResId; const char* mpStrResId; - WritingMode meWritingMode; - AutoLayout maAutoLayout; + WritingMode const meWritingMode; + AutoLayout const maAutoLayout; }; static const snewfoil_value_info notes[] = diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index da480cb1ac10..9ca123b1af0c 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -116,7 +116,7 @@ public: virtual SdPage* operator () (SdDrawDocument* pDocument) override; virtual int GetCostIndex() override; private: - OUString msURL; + OUString const msURL; SfxObjectShellLock mxDocumentShell; ::sd::DrawDocShell* LoadDocument (const OUString& sFileName); }; @@ -133,7 +133,7 @@ public: virtual int GetCostIndex() override; virtual bool NeedsPageObject() override; private: - OUString msURL; + OUString const msURL; }; /** Create an empty default master page. @@ -158,7 +158,7 @@ public: virtual SdPage* operator() (SdDrawDocument* pDocument) override; virtual int GetCostIndex() override; private: - SdPage* mpPage; + SdPage* const mpPage; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 5493c2be72fb..98e42367e1f6 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -40,8 +40,8 @@ public: : mpDescriptor(rpDescriptor), mnPriority(nPriority) {} - SharedMasterPageDescriptor mpDescriptor; - int mnPriority; + SharedMasterPageDescriptor const mpDescriptor; + int const mnPriority; class Compare { public: @@ -63,7 +63,7 @@ public: class CompareToken { public: - MasterPageContainer::Token maToken; + MasterPageContainer::Token const maToken; explicit CompareToken(MasterPageContainer::Token aToken) : maToken(aToken) {} bool operator() (const PreviewCreationRequest& rRequest) const { return maToken==rRequest.mpDescriptor->maToken; } diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index 092af203e894..7857fd4752b0 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -77,7 +77,7 @@ public: void ProcessAllRequests(); private: - std::weak_ptr<ContainerAdapter> mpWeakContainer; + std::weak_ptr<ContainerAdapter> const mpWeakContainer; class PreviewCreationRequest; class RequestQueue; std::unique_ptr<RequestQueue> mpRequestQueue; diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index dfc7795189b5..9355c2a2f304 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -201,12 +201,12 @@ public: sal_Int32 mnUseCount; class URLComparator { public: - OUString msURL; + OUString const msURL; explicit URLComparator (const OUString& sURL); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; class StyleNameComparator { public: - OUString msStyleName; + OUString const msStyleName; explicit StyleNameComparator (const OUString& sStyleName); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; @@ -219,7 +219,7 @@ public: explicit AllComparator(const SharedMasterPageDescriptor& rDescriptor); bool operator() (const SharedMasterPageDescriptor& rDescriptor); private: - SharedMasterPageDescriptor mpDescriptor; + SharedMasterPageDescriptor const mpDescriptor; }; }; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index a5b8479dee45..4fea1417a7a9 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -61,6 +61,11 @@ using namespace ::com::sun::star::text; namespace sd { namespace sidebar { + /** menu entry that is executed as default action when the left mouse button is + clicked over a master page. + */ +static const char gsDefaultClickAction[] = "applyselect"; + MasterPagesSelector::MasterPagesSelector ( vcl::Window* pParent, SdDrawDocument& rDocument, @@ -72,7 +77,6 @@ MasterPagesSelector::MasterPagesSelector ( mpContainer(rpContainer), mrDocument(rDocument), mrBase(rBase), - msDefaultClickAction("applyselect"), maCurrentItemList(), maTokenToValueSetIndex(), maLockedMasterPages(), @@ -171,7 +175,7 @@ IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void) // We use the framework to assign the clicked-on master page because we // so use the same mechanism as the context menu does (where we do not // have the option to call the assignment method directly.) - ExecuteCommand(msDefaultClickAction); + ExecuteCommand(gsDefaultClickAction); } IMPL_LINK(MasterPagesSelector, RightClickHandler, const MouseEvent&, rEvent, void) diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 09090f70ee2d..c058368c2793 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -99,10 +99,6 @@ protected: SdDrawDocument& mrDocument; ViewShellBase& mrBase; - /** menu entry that is executed as default action when the left mouse button is - clicked over a master page. - */ - OString msDefaultClickAction; SdPage* GetSelectedMasterPage(); diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 30785589e4ad..5d471b11d53f 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -85,10 +85,11 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance() return *mpInstance; } +static constexpr size_t gnMaxListSize(8); + RecentlyUsedMasterPages::RecentlyUsedMasterPages() : maListeners(), mvMasterPages(), - mnMaxListSize(8), mpContainer(new MasterPageContainer()) { } @@ -341,7 +342,7 @@ void RecentlyUsedMasterPages::AddMasterPage ( mpContainer->GetStyleNameForToken(aToken))); // Shorten list to maximal size. - while (mvMasterPages.size() > mnMaxListSize) + while (mvMasterPages.size() > gnMaxListSize) { mvMasterPages.pop_back (); } diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index 01747f2da040..88411a859c15 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -74,7 +74,7 @@ private: { return maToken==rDescriptor.maToken; } private: - ::sd::sidebar::MasterPageContainer::Token maToken; + ::sd::sidebar::MasterPageContainer::Token const maToken; }; }; @@ -87,7 +87,6 @@ private: typedef ::std::vector<Descriptor> MasterPageList; MasterPageList mvMasterPages; - unsigned long int mnMaxListSize; std::shared_ptr<MasterPageContainer> mpContainer; RecentlyUsedMasterPages(); diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 7ad06782e278..a1035ec5aab1 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -124,12 +124,12 @@ private: css::uno::Reference<css::frame::XFrame> mxFrame; vcl::EnumContext maContext; - vcl::EnumContext maDrawOtherContext; - vcl::EnumContext maDrawMasterContext; - vcl::EnumContext maImpressOtherContext; - vcl::EnumContext maImpressMasterContext; - vcl::EnumContext maImpressHandoutContext; - vcl::EnumContext maImpressNotesContext; + vcl::EnumContext const maDrawOtherContext; + vcl::EnumContext const maDrawMasterContext; + vcl::EnumContext const maImpressOtherContext; + vcl::EnumContext const maImpressMasterContext; + vcl::EnumContext const maImpressHandoutContext; + vcl::EnumContext const maImpressNotesContext; bool mbTitle; std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem; std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem; @@ -139,7 +139,7 @@ private: long m_nPageBottomMargin; OUString maCustomEntry; - SfxBindings* mpBindings; + SfxBindings* const mpBindings; MapUnit meUnit; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index cc07c9c37717..eef3ea1f6251 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -154,7 +154,7 @@ private: bool isValidSlideNumber( sal_Int32 nSlideNumber ) const { return (nSlideNumber >= 0) && (nSlideNumber < mnSlideCount); } private: - Mode meMode; + Mode const meMode; sal_Int32 mnStartSlideNumber; std::vector< sal_Int32 > maSlideNumbers; std::vector< bool > maSlideVisible; @@ -467,6 +467,10 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow } } +static constexpr OUStringLiteral gsOnClick( "OnClick" ); +static constexpr OUStringLiteral gsBookmark( "Bookmark" ); +static constexpr OUStringLiteral gsVerb( "Verb" ); + SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow ) : SlideshowImplBase( m_aMutex ) , mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW) @@ -493,9 +497,6 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, , mnUserPaintColor( 0x80ff0000L ) , mbUsePen(false) , mdUserPaintStrokeWidth ( 150.0 ) -, msOnClick( "OnClick" ) -, msBookmark( "Bookmark" ) -, msVerb( "Verb" ) , mnEndShowEvent(nullptr) , mnContextMenuEvent(nullptr) , mxPresentation( xPresentation ) @@ -1257,11 +1258,11 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes ) continue; Reference< XPropertySetInfo > xSetInfo( xSet->getPropertySetInfo() ); - if( !xSetInfo.is() || !xSetInfo->hasPropertyByName( msOnClick ) ) + if( !xSetInfo.is() || !xSetInfo->hasPropertyByName( gsOnClick ) ) continue; WrappedShapeEventImplPtr pEvent( new WrappedShapeEventImpl ); - xSet->getPropertyValue( msOnClick ) >>= pEvent->meClickAction; + xSet->getPropertyValue( gsOnClick ) >>= pEvent->meClickAction; switch( pEvent->meClickAction ) { @@ -1272,8 +1273,8 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes ) case ClickAction_STOPPRESENTATION: break; case ClickAction_BOOKMARK: - if( xSetInfo->hasPropertyByName( msBookmark ) ) - xSet->getPropertyValue( msBookmark ) >>= pEvent->maStrBookmark; + if( xSetInfo->hasPropertyByName( gsBookmark ) ) + xSet->getPropertyValue( gsBookmark ) >>= pEvent->maStrBookmark; if( getSlideNumberForBookmark( pEvent->maStrBookmark ) == -1 ) continue; break; @@ -1281,12 +1282,12 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes ) case ClickAction_SOUND: case ClickAction_PROGRAM: case ClickAction_MACRO: - if( xSetInfo->hasPropertyByName( msBookmark ) ) - xSet->getPropertyValue( msBookmark ) >>= pEvent->maStrBookmark; + if( xSetInfo->hasPropertyByName( gsBookmark ) ) + xSet->getPropertyValue( gsBookmark ) >>= pEvent->maStrBookmark; break; case ClickAction_VERB: - if( xSetInfo->hasPropertyByName( msVerb ) ) - xSet->getPropertyValue( msVerb ) >>= pEvent->mnVerb; + if( xSetInfo->hasPropertyByName( gsVerb ) ) + xSet->getPropertyValue( gsVerb ) >>= pEvent->mnVerb; break; default: continue; // skip all others diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 5ba37185e27f..63b67ad40f9f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -358,10 +358,6 @@ private: WrappedShapeEventImplMap maShapeEventMap; - OUString msOnClick; - OUString msBookmark; - OUString msVerb; - css::uno::Reference< css::drawing::XDrawPage > mxPreviewDrawPage; css::uno::Reference< css::animations::XAnimationNode > mxPreviewAnimationNode; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index b8f6cab5ab69..dbf8e7e42c1e 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -237,12 +237,12 @@ private: mpMouseListeners; ::std::unique_ptr< SlideShowViewMouseMotionListeners > mpMouseMotionListeners; - SdDrawDocument* mpDoc; + SdDrawDocument* const mpDoc; bool mbIsMouseMotionListener; - ::tools::Rectangle maPresentationArea; - AnimationMode meAnimationMode; + ::tools::Rectangle maPresentationArea; + AnimationMode const meAnimationMode; bool mbFirstPaint; - bool mbFullScreen; + bool const mbFullScreen; bool mbMousePressedEaten; css::geometry::IntegerSize2D mTranslationOffset; }; diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index 4cf521e622f0..053604793e76 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -35,7 +35,7 @@ class NoBitmapCompression::DummyReplacement : public BitmapReplacement { public: - BitmapEx maPreview; + BitmapEx const maPreview; explicit DummyReplacement (const BitmapEx& rPreview) : maPreview(rPreview) { } virtual ~DummyReplacement() {} diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index bccb196c2d78..8babf5ebb3e0 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -63,7 +63,7 @@ public: protected: BitmapCache& mrCache; - sal_Int32 mnMaximalCacheSize; + sal_Int32 const mnMaximalCacheSize; CacheCompactor( BitmapCache& rCache, diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index bffd9fd346d2..6192c75c0576 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -35,7 +35,7 @@ class CacheDescriptor { public: ::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument; - Size maPreviewSize; + Size const maPreviewSize; CacheDescriptor( ::sd::slidesorter::cache::PageCacheManager::DocumentKey const & pDocument, @@ -99,7 +99,7 @@ public: } private: - Size maPreferredSize; + Size const maPreferredSize; }; } // end of anonymous namespace diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 6ca9a6443500..ce31c1258de0 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -72,9 +72,9 @@ public: const CacheKey maKey; }; - CacheKey maKey; - sal_Int32 mnPriorityInClass; - RequestPriorityClass meClass; + CacheKey const maKey; + sal_Int32 const mnPriorityInClass; + RequestPriorityClass const meClass; }; class RequestQueue::Container diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index f5afb22c7c5f..5ead8fad8ee1 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -48,8 +48,8 @@ public: void Expire(); bool IsExpired() { return mbIsExpired;} - Animator::AnimationFunctor maAnimation; - Animator::FinishFunctor maFinishFunctor; + Animator::AnimationFunctor const maAnimation; + Animator::FinishFunctor const maFinishFunctor; const Animator::AnimationId mnAnimationId; const double mnDuration; const double mnEnd; diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index a91e18f0fbd2..1330ad1953f0 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -34,6 +34,9 @@ namespace sd { namespace slidesorter { namespace controller { +static constexpr double gnHorizontalScrollFactor(0.15); +static constexpr double gnVerticalScrollFactor(0.25); + ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mpHorizontalScrollBar(mrSlideSorter.GetHorizontalScrollBar()), @@ -41,8 +44,6 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) mnHorizontalPosition (0), mnVerticalPosition (0), maScrollBorder (20,20), - mnHorizontalScrollFactor (0.15), - mnVerticalScrollFactor (0.25), mpScrollBarFiller(mrSlideSorter.GetScrollBarFiller()), maAutoScrollTimer(), maAutoScrollOffset(0,0), @@ -448,14 +449,14 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.X() < maScrollBorder.Width() && aWindowArea.Left() > aViewPixelArea.Left()) { - nDx = -1 + static_cast<int>(mnHorizontalScrollFactor + nDx = -1 + static_cast<int>(gnHorizontalScrollFactor * (rMouseWindowPosition.X() - maScrollBorder.Width())); } if (rMouseWindowPosition.X() >= (aWindowSize.Width() - maScrollBorder.Width()) && aWindowArea.Right() < aViewPixelArea.Right()) { - nDx = 1 + static_cast<int>(mnHorizontalScrollFactor + nDx = 1 + static_cast<int>(gnHorizontalScrollFactor * (rMouseWindowPosition.X() - aWindowSize.Width() + maScrollBorder.Width())); } @@ -467,14 +468,14 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.Y() < maScrollBorder.Height() && aWindowArea.Top() > aViewPixelArea.Top()) { - nDy = -1 + static_cast<int>(mnVerticalScrollFactor + nDy = -1 + static_cast<int>(gnVerticalScrollFactor * (rMouseWindowPosition.Y() - maScrollBorder.Height())); } if (rMouseWindowPosition.Y() >= (aWindowSize.Height() - maScrollBorder.Height()) && aWindowArea.Bottom() < aViewPixelArea.Bottom()) { - nDy = 1 + static_cast<int>(mnVerticalScrollFactor + nDy = 1 + static_cast<int>(gnVerticalScrollFactor * (rMouseWindowPosition.Y() - aWindowSize.Height() + maScrollBorder.Height())); } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index ba4237082110..202ed5cd2c4c 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -102,12 +102,12 @@ namespace sd { namespace slidesorter { namespace controller { class SelectionFunction::EventDescriptor { public: - Point maMousePosition; + Point const maMousePosition; Point maMouseModelPosition; model::SharedPageDescriptor mpHitDescriptor; SdrPage* mpHitPage; sal_uInt32 mnEventCode; - InsertionIndicatorHandler::Mode meDragMode; + InsertionIndicatorHandler::Mode const meDragMode; bool mbIsLeaving; EventDescriptor ( @@ -253,7 +253,7 @@ protected: private: SelectionMode meSelectionMode; Point maSecondCorner; - Pointer maSavedPointer; + Pointer const maSavedPointer; bool mbAutoScrollInstalled; sal_Int32 mnAnchorIndex; sal_Int32 mnSecondIndex; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index f3f7b061bed6..bfa41444f090 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -94,7 +94,7 @@ private: class Animation; typedef ::std::vector<std::shared_ptr<Animation> > AnimationList; AnimationList maAnimations; - ::canvas::tools::ElapsedTime maElapsedTime; + ::canvas::tools::ElapsedTime const maElapsedTime; std::unique_ptr<view::SlideSorterView::DrawLock, o3tl::default_delete<view::SlideSorterView::DrawLock>> mpDrawLock; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 7fc7d3483223..0269690f1451 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -160,7 +160,7 @@ public: FocusHider (FocusManager&); ~FocusHider() COVERITY_NOEXCEPT_FALSE; private: - bool mbFocusVisible; + bool const mbFocusVisible; FocusManager& mrManager; }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index cec4061a6a00..e9677e464dda 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -179,9 +179,7 @@ private: /** The width and height of the border at the inside of the window which when entered while in drag mode leads to a scrolling of the window. */ - Size maScrollBorder; - double mnHorizontalScrollFactor; - double mnVerticalScrollFactor; + Size const maScrollBorder; /** The only task of this little window is to paint the little square at the bottom right corner left by the two scroll bars (when both are visible). diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 35b3480286c5..9d942c59c395 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -46,8 +46,8 @@ public: Representative (const BitmapEx& rBitmap, const bool bIsExcluded) : maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {} - BitmapEx maBitmap; - bool mbIsExcluded; + BitmapEx const maBitmap; + bool const mbIsExcluded; }; static SdTransferable* CreateTransferable ( diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 8da2748ef70d..5706500825c9 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -224,7 +224,7 @@ private: model::SharedPageDescriptor mpPageUnderMouse; std::shared_ptr<PageObjectPainter> mpPageObjectPainter; vcl::Region maRedrawRegion; - SharedILayerPainter mpBackgroundPainter; + SharedILayerPainter const mpBackgroundPainter; std::unique_ptr<ToolTip, o3tl::default_delete<ToolTip>> mpToolTip; bool mbIsRearrangePending; ::std::vector<Link<LinkParamNone*,void>> maVisibilityChangeListeners; diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index b53d8479a6b0..494c7825f5d1 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -69,14 +69,14 @@ public: void ResetOffsets (const controller::Animator::AnimationMode eMode); /// Index of the row or column that this run represents. - sal_Int32 mnRunIndex; + sal_Int32 const mnRunIndex; /// The index at which to make place for the insertion indicator (-1 for /// no indicator). sal_Int32 mnLocalInsertIndex; /// Index of the first page in the run. - sal_Int32 mnStartIndex; + sal_Int32 const mnStartIndex; /// Index of the last page in the run. - sal_Int32 mnEndIndex; + sal_Int32 const mnEndIndex; /// Offset of each item in the run at the start of the current animation. ::std::vector<Point> maStartOffset; /// Target offset of each item in the run at the end of the current animation. @@ -96,7 +96,7 @@ public: private: controller::Animator::AnimationId mnAnimationId; AnimatorAccess& mrAnimatorAccess; - ::std::function<double (double)> maAccelerationFunction; + ::std::function<double (double)> const maAccelerationFunction; void RestartAnimation(); }; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index d746f0f10bf4..f25589dfb917 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -38,11 +38,11 @@ public: sal_Int32 mnRightBorder; sal_Int32 mnTopBorder; sal_Int32 mnBottomBorder; - sal_Int32 mnVerticalGap; - sal_Int32 mnHorizontalGap; - Size maMinimalSize; - Size maPreferredSize; - Size maMaximalSize; + sal_Int32 const mnVerticalGap; + sal_Int32 const mnHorizontalGap; + Size const maMinimalSize; + Size const maPreferredSize; + Size const maMaximalSize; sal_Int32 mnMinimalColumnCount; sal_Int32 mnMaximalColumnCount; sal_Int32 mnPageCount; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 24b0f61993e5..9d8f34d3cd50 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -101,7 +101,7 @@ private: class TableDesignPane : public PanelLayout { private: - TableDesignWidget aImpl; + TableDesignWidget const aImpl; public: TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase ) : PanelLayout(pParent, "TableDesignPanel", diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx index 32aa85f0e675..222217175fa6 100644 --- a/sd/source/ui/table/tableobjectbar.hxx +++ b/sd/source/ui/table/tableobjectbar.hxx @@ -49,7 +49,7 @@ private: /// SfxInterface initializer. static void InitInterface_Impl(); - ::sd::View* mpView; + ::sd::View* const mpView; ::sd::ViewShell* mpViewSh; }; diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx index 1e15f86b248e..4919ffc91c75 100644 --- a/sd/source/ui/uitest/uiobject.cxx +++ b/sd/source/ui/uitest/uiobject.cxx @@ -26,7 +26,7 @@ public: private: VclPtr<sd::Window> mxWindow; - OUString maName; + OUString const maName; }; namespace { diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index bc9553287cec..05d9af5ca483 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1529,8 +1529,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( class ImplRenderPaintProc : public sdr::contact::ViewObjectContactRedirector { const SdrLayerAdmin& rLayerAdmin; - SdrPageView* pSdrPageView; - vcl::PDFExtOutDevData* pPDFExtOutDevData; + SdrPageView* const pSdrPageView; + vcl::PDFExtOutDevData* const pPDFExtOutDevData; vcl::PDFWriter::StructElement ImplBegStructureTag( SdrObject& rObject ); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 18439a352df0..9d1b02e8d552 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1039,7 +1039,7 @@ uno::Any SdXShape::GetStyleSheet() const class SdUnoEventsAccess : public cppu::WeakImplHelper< css::container::XNameReplace, css::lang::XServiceInfo > { private: - SdXShape* mpShape; + SdXShape* const mpShape; public: explicit SdUnoEventsAccess(SdXShape* pShape) throw(); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index ccfef3e9e8e1..ae5cd6fdae37 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -364,8 +364,8 @@ namespace { ViewShellBase &mrBase; std::vector<beans::PropertyValue> maProperties; std::vector<sal_Int32> maSlidesPerPage; - bool mbImpress; - sal_Int32 mnCurPage; + bool const mbImpress; + sal_Int32 const mnCurPage; void ProcessResource() { @@ -1316,7 +1316,7 @@ public: private: // rhbz#657394: keep the document alive: prevents crash when - SfxObjectShellRef mxObjectShell; // destroying mpPrintView + SfxObjectShellRef const mxObjectShell; // destroying mpPrintView ViewShellBase& mrBase; bool mbIsDisposed; VclPtr<Printer> mpPrinter; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index fb8eaba84484..7a1e70cc58a3 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -83,7 +83,7 @@ public: bool operator() (const ShellDescriptor& rDescriptor) { return rDescriptor.mnId == mnId; } private: - ShellId mnId; + ShellId const mnId; }; } // end of anonymous namespace diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 5e57c1e3f3f7..3486f9be2013 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1208,10 +1208,10 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const class KeepSlideSorterInSyncWithPageChanges { - sd::slidesorter::view::SlideSorterView::DrawLock m_aDrawLock; - sd::slidesorter::controller::SlideSorterController::ModelChangeLock m_aModelLock; - sd::slidesorter::controller::PageSelector::UpdateLock m_aUpdateLock; - sd::slidesorter::controller::SelectionObserver::Context m_aContext; + sd::slidesorter::view::SlideSorterView::DrawLock const m_aDrawLock; + sd::slidesorter::controller::SlideSorterController::ModelChangeLock const m_aModelLock; + sd::slidesorter::controller::PageSelector::UpdateLock const m_aUpdateLock; + sd::slidesorter::controller::SelectionObserver::Context const m_aContext; public: explicit KeepSlideSorterInSyncWithPageChanges(sd::slidesorter::SlideSorter const & rSlideSorter) |