diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-08 16:12:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-09 08:10:59 +0200 |
commit | 453879cfd8f4a8e22847043231a0929e4d50f238 (patch) | |
tree | e3f9e78f4be775a31f99e27e20747b54d2e9a941 /sd/source/ui/inc | |
parent | ec7e3609917092ee00667c78ff40cd4c2f0adec1 (diff) |
loplugin:constfields in sd
Change-Id: Ia072401c71dacf089b9f5213957c2cd25bb1a1b3
Reviewed-on: https://gerrit.libreoffice.org/61553
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/inc')
32 files changed, 85 insertions, 85 deletions
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; |