diff options
Diffstat (limited to 'include')
40 files changed, 81 insertions, 84 deletions
diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 94ec091b2928..9843cf00e529 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -24,7 +24,7 @@ protected: const SfxObjectShell& mrShell; OutputDevice& mrOutputDev; SfxStyleSheetBase* mpStyle; - long mnMaxHeight; + long const mnMaxHeight; public: enum class RenderAlign diff --git a/include/sfx2/asyncfunc.hxx b/include/sfx2/asyncfunc.hxx index 16e01969baba..6fd68899fb99 100644 --- a/include/sfx2/asyncfunc.hxx +++ b/include/sfx2/asyncfunc.hxx @@ -18,7 +18,7 @@ class AsyncFunc : public cppu::WeakImplHelper<css::lang::XUnoTunnel> { private: - std::function<void()> m_pAsyncFunc; + std::function<void()> const m_pAsyncFunc; public: AsyncFunc(const std::function<void()>&); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 3059d38a5cbb..8c46889e533f 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -92,8 +92,8 @@ typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( vcl::Window *pParentWi SfxChildWinInfo *pInfo); struct SfxChildWinContextFactory { - SfxChildWinContextCtor pCtor; // Factory method - sal_uInt16 nContextId; // Identifier for SfxInterface + SfxChildWinContextCtor const pCtor; // Factory method + sal_uInt16 const nContextId; // Identifier for SfxInterface SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID ) : pCtor(pTheCtor) @@ -105,10 +105,10 @@ class SfxChildWinContextArr_Impl; struct SFX2_DLLPUBLIC SfxChildWinFactory { - SfxChildWinCtor pCtor; // Factory method - sal_uInt16 nId; // ChildWindow-Id ( SlotId ) + SfxChildWinCtor const pCtor; // Factory method + sal_uInt16 const nId; // ChildWindow-Id ( SlotId ) SfxChildWinInfo aInfo; // Configuration - sal_uInt16 nPos; // Position in UI + sal_uInt16 const nPos; // Position in UI std::unique_ptr<SfxChildWinContextArr_Impl> pArr; // Array for Contexts SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, sal_uInt16 n ); @@ -144,7 +144,7 @@ public: class SFX2_DLLPUBLIC SfxChildWindow { VclPtr<vcl::Window> pParent; // parent window ( Topwindow ) - sal_uInt16 nType; // ChildWindow-Id + sal_uInt16 const nType; // ChildWindow-Id VclPtr<vcl::Window> pWindow; // actual contents SfxChildAlignment eChildAlignment; // Current css::drawing::Alignment std::unique_ptr< SfxChildWindow_Impl> pImpl; // Implementation data diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index b81ad28d5951..6a85f0c42958 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -68,8 +68,8 @@ public: /** A helper struct that contains a list position - value pair. */ struct MapEntryType { - PosT mnPos; /// Position in the list. - ValueT mnValue; /// Corresponding value. + PosT const mnPos; /// Position in the list. + ValueT const mnValue; /// Corresponding value. }; /** Constructs the map helper with the passed map. diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index a4b7e680c6e3..4b3e576df7cd 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -65,7 +65,7 @@ private: OUString m_AutoloadURL; bool m_isAutoloadEnabled; OUString m_DefaultTarget; - OUString m_TemplateName; + OUString const m_TemplateName; OUString m_Author; css::util::DateTime m_CreationDate; OUString m_ModifiedBy; @@ -262,7 +262,7 @@ struct CustomPropertyLine; class CustomPropertiesEdit : public Edit { private: - CustomPropertyLine* m_pLine; + CustomPropertyLine* const m_pLine; public: CustomPropertiesEdit(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine) @@ -277,7 +277,7 @@ public: class CustomPropertiesTypeBox : public ListBox { private: - CustomPropertyLine* m_pLine; + CustomPropertyLine* const m_pLine; public: CustomPropertiesTypeBox(vcl::Window* pParent, CustomPropertyLine* pLine); @@ -309,7 +309,7 @@ public: class CustomPropertiesDurationField : public Edit { - CustomPropertyLine* m_pLine; + CustomPropertyLine* const m_pLine; css::util::Duration m_aDuration; protected: virtual void RequestHelp(const HelpEvent& rEvt) override; @@ -333,7 +333,7 @@ public: class CustomPropertiesRemoveButton : public ImageButton { private: - CustomPropertyLine* m_pLine; + CustomPropertyLine* const m_pLine; public: CustomPropertiesRemoveButton(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine) diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index c9fc6c880805..cdde177c02c8 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxObjectFactory private: const OUString m_sFactoryName; std::unique_ptr<SfxObjectFactory_Impl> pImpl; // Additional Data - SfxObjectShellFlags nFlags; + SfxObjectShellFlags const nFlags; public: SfxObjectFactory( const SvGlobalName &rName, SfxObjectShellFlags nFlags, const OUString& sFactoryName ); diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index ceeae3cf980f..54d4a26922c4 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -55,7 +55,7 @@ class SFX2_DLLPUBLIC SfxFilter * Custom provider name in case the filter is provided via external * libraries. Empty for conventional filter types. */ - OUString maProvider; + OUString const maProvider; SfxFilterFlags nFormatType; sal_Int32 nVersion; diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 6befefcb31a3..21fb1a2a9c37 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -40,8 +40,8 @@ namespace sfx2 { class SFX2_DLLPUBLIC DocumentInserter { private: - weld::Window* m_pParent; - OUString m_sDocFactory; + weld::Window* const m_pParent; + OUString const m_sDocFactory; OUString m_sFilter; Link<sfx2::FileDialogHelper*,void> m_aDialogClosedLink; diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx index 8830a6d83344..6c311d740e0a 100644 --- a/include/sfx2/emojiview.hxx +++ b/include/sfx2/emojiview.hxx @@ -48,7 +48,7 @@ public: private: - FILTER_CATEGORY mCategory; + FILTER_CATEGORY const mCategory; }; diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 78d8736bc522..8a797d3379e1 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -189,9 +189,9 @@ inline std::basic_ostream<charT, traits> & operator <<( class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { - SfxObjectShell* pObjShell; - OUString aEventName; - SfxEventHintId nEventId; + SfxObjectShell* const pObjShell; + OUString const aEventName; + SfxEventHintId const nEventId; public: SfxEventHint( SfxEventHintId nId, const OUString& aName, SfxObjectShell *pObj ) @@ -234,8 +234,8 @@ class Printer; class SfxPrintingHint : public SfxViewEventHint { - css::view::PrintableState mnPrintableState; - css::uno::Sequence < css::beans::PropertyValue > aOpts; + css::view::PrintableState const mnPrintableState; + css::uno::Sequence < css::beans::PropertyValue > const aOpts; public: SfxPrintingHint( css::view::PrintableState nState, diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 670b3ec6b558..2c863eb05222 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -35,9 +35,9 @@ class SvxMacroTableDtor; struct SFX2_DLLPUBLIC SfxEventName { - SvMacroItemId mnId; - OUString maEventName; - OUString maUIName; + SvMacroItemId const mnId; + OUString const maEventName; + OUString const maUIName; SfxEventName( SvMacroItemId nId, const OUString& rEventName, diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 17aff3c148b5..091599e82b9f 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -102,7 +102,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter { SfxFilterFlags nOrMask; - SfxFilterFlags nAndMask; + SfxFilterFlags const nAndMask; sal_uInt16 nCurrent; const SfxFilterMatcher_Impl &m_rMatch; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 4a9c39578b82..caf8b5b82518 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -30,7 +30,7 @@ enum class InfoBarType { class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow { private: - SfxBindings* m_pBindings; + SfxBindings* const m_pBindings; public: SfxInfoBarContainerChild( vcl::Window* pParent, @@ -49,7 +49,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow class SFX2_DLLPUBLIC SfxInfoBarWindow : public vcl::Window { private: - OUString m_sId; + OUString const m_sId; InfoBarType m_eType; VclPtr<FixedImage> m_pImage; VclPtr<FixedText> m_pMessage; diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 3471dde4d10a..7d592f1fe03f 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -103,7 +103,7 @@ public: css::uno::Reference<css::io::XInputStream> m_xInputStreamToLoadFrom; - bool m_bIsReadOnly; + bool const m_bIsReadOnly; }; StreamToLoadFrom getStreamToLoadFrom(); diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx index deb2c43f0556..92c57217f621 100644 --- a/include/sfx2/lokcharthelper.hxx +++ b/include/sfx2/lokcharthelper.hxx @@ -23,7 +23,7 @@ class VirtualDevice; class SFX2_DLLPUBLIC LokChartHelper { private: - SfxViewShell* mpViewShell; + SfxViewShell* const mpViewShell; css::uno::Reference<css::frame::XController> mxController; css::uno::Reference<css::frame::XDispatch> mxDispatcher; VclPtr<vcl::Window> mpWindow; diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index b0ea05e2ee87..bce77d1d5965 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -47,7 +47,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage OUString aName; OUString aFollow; OUString aParent; - SfxStyleSearchBits nFlags; + SfxStyleSearchBits const nFlags; std::unique_ptr<weld::Entry> m_xName; std::unique_ptr<weld::CheckButton> m_xAutoCB; diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 4ee078822e2d..0a92857c261a 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -32,7 +32,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem OUString aLibName; OUString aModuleName; OUString aMethodName; - OUString aCommentText; + OUString const aCommentText; public: static SfxPoolItem* CreateDefault(); diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index a9000398103b..25b5121d3dcd 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -102,9 +102,9 @@ template<class T> SfxPoolItem* createSfxPoolItem() } struct SfxType { - std::function<SfxPoolItem* ()> createSfxPoolItemFunc; + std::function<SfxPoolItem* ()> const createSfxPoolItemFunc; const std::type_info* pType; - sal_uInt16 nAttribs; + sal_uInt16 const nAttribs; SfxTypeAttrib aAttrib[1]; // variable length const std::type_info* Type() const{return pType;} @@ -114,9 +114,9 @@ struct SfxType struct SfxType0 { - std::function<SfxPoolItem* ()> createSfxPoolItemFunc; - const std::type_info* pType; - sal_uInt16 nAttribs; + std::function<SfxPoolItem* ()> const createSfxPoolItemFunc; + const std::type_info* pType; + sal_uInt16 const nAttribs; const std::type_info* Type() const { return pType;} }; #define SFX_DECL_TYPE(n) struct SfxType##n \ @@ -171,9 +171,9 @@ SFX_DECL_TYPE(23); // for SvxSearchItem struct SfxFormalArgument { - const SfxType* pType; // Type of the parameter (SfxPoolItem subclass) - const char* pName; // Name of the sParameters - sal_uInt16 nSlotId; // Slot-Id for identification of the Parameters + const SfxType* pType; // Type of the parameter (SfxPoolItem subclass) + const char* pName; // Name of the sParameters + sal_uInt16 const nSlotId; // Slot-Id for identification of the Parameters std::unique_ptr<SfxPoolItem> CreateItem() const { return pType->CreateItem(); } diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 0697414fa4ca..bdc0a9b8de99 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxDialogController { private: Idle m_aPrevIdle; - SfxNewFileDialogMode m_nFlags; + SfxNewFileDialogMode const m_nFlags; SfxDocumentTemplates m_aTemplates; SfxObjectShellLock m_xDocShell; diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index cb0797b5ce6b..bfda103a48ff 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -62,8 +62,8 @@ friend class SfxSlotPool; const SfxInterface* pGenoType; // base interface SfxSlot* pSlots; // SlotMap sal_uInt16 nCount; // number of slots in SlotMap - SfxInterfaceId nClassId; // Id of interface - bool bSuperClass; // Whether children inherit its toolbars etc + SfxInterfaceId const nClassId; // Id of interface + bool const bSuperClass; // Whether children inherit its toolbars etc std::unique_ptr<SfxInterface_Impl> pImplData; public: diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index b07478c318ef..b8d4f72ea844 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem { - SfxShell* _pSh; + SfxShell* const _pSh; public: static SfxPoolItem* CreateDefault(); diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index a09364cf6918..414185b39113 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -64,9 +64,9 @@ private: std::unique_ptr<weld::Button> m_xOKBtn; - OUString maMinLenPwdStr; - OUString maMinLenPwdStr1; - OUString maEmptyPwdStr; + OUString const maMinLenPwdStr; + OUString const maMinLenPwdStr1; + OUString const maEmptyPwdStr; OUString maMainPwdStr; sal_uInt16 mnMinLen; SfxShowExtras mnExtras; diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index a22dae2d6e87..3210d47c651f 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -85,14 +85,12 @@ private: bool isAcceptedFile(const OUString &rURL) const; long mnItemMaxSize; - long mnTextHeight; - long mnItemPadding; size_t mnLastMouseDownItem; /// Image that appears when there is no recent document. - Image maWelcomeImage; - OUString maWelcomeLine1; - OUString maWelcomeLine2; + Image const maWelcomeImage; + OUString const maWelcomeLine1; + OUString const maWelcomeLine2; }; } // namespace sfx2 diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index 57c11ccabb1f..8320d4710d81 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -41,16 +41,16 @@ private: /// Return area where is the icon to remove document from the recent documents. tools::Rectangle getRemoveIconArea() const; - OUString maURL; + OUString const maURL; OUString m_sHelpText; /// Is the icon that the user can click to remove the document from the recent documents highlighted? bool m_bRemoveIconHighlighted; - BitmapEx m_aRemoveRecentBitmap; + BitmapEx const m_aRemoveRecentBitmap; - BitmapEx m_aRemoveRecentBitmapHighlighted; + BitmapEx const m_aRemoveRecentBitmapHighlighted; }; #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 19ee5cfb3864..318d70af1209 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -37,7 +37,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser { OUString aScriptType; - SfxMedium* pMedium; + SfxMedium* const pMedium; std::unique_ptr<SfxMedium> pDLMedium; // Medium for Download Files ScriptType eScriptType; diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index 0f261803bb68..f612da5f4755 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -63,7 +63,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper< SfxStatusListener( const SfxStatusListener& ) = delete; SfxStatusListener& operator=( const SfxStatusListener& ) = delete; - sal_uInt16 m_nSlotID; + sal_uInt16 const m_nSlotID; css::util::URL m_aCommand; css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; css::uno::Reference< css::frame::XDispatch > m_xDispatch; diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index 5e7d06b0a344..b42caf50ed19 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -43,7 +43,7 @@ public: void CancelRequest(); private: - Action maAction; + Action const maAction; ImplSVEvent * mnCallId; DECL_LINK(HandleUserCall, void*, void); diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index 0e86c1f96c70..c0d9ed9ba2d9 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -105,7 +105,7 @@ private: mutable std::set<rtl::OUString> maProcessedApplications; std::map<OUString, OUString> maLastActiveDecks; - SvtMiscOptions maMiscOptions; + SvtMiscOptions const maMiscOptions; void ReadDeckList(); void ReadPanelList(); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index e0f12a5f15ee..c672bcbf71d0 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -109,7 +109,7 @@ private: ItemContainer maItems; const ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor; sal_Int32 mnMenuSeparatorY; - PopupMenuProvider maPopupMenuProvider; + PopupMenuProvider const maPopupMenuProvider; VclPtr<RadioButton> CreateTabItem (const DeckDescriptor& rDeckDescriptor); Image GetItemImage (const DeckDescriptor& rDeskDescriptor) const; diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index b72688486e94..5abab5b9f6b3 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -39,9 +39,9 @@ typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal struct SfxStbCtrlFactory { - SfxStatusBarControlCtor pCtor; + SfxStatusBarControlCtor const pCtor; const std::type_info& nTypeId; - sal_uInt16 nSlotId; + sal_uInt16 const nSlotId; SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor, const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ): @@ -58,8 +58,8 @@ class UserDrawEvent; class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController { - sal_uInt16 nSlotId; - sal_uInt16 nId; + sal_uInt16 const nSlotId; + sal_uInt16 const nId; VclPtr<StatusBar> pBar; protected: diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index d8f6057e7513..88a69fe40c72 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -29,7 +29,7 @@ struct SFX2_DLLPUBLIC SfxFilterTuple { - OUString aName; + OUString const aName; SfxStyleSearchBits nFlags; SfxFilterTuple(const OUString& rName, SfxStyleSearchBits nArg) : aName(rName) @@ -42,9 +42,9 @@ typedef std::vector<SfxFilterTuple> SfxStyleFilter; class SFX2_DLLPUBLIC SfxStyleFamilyItem { - SfxStyleFamily nFamily; - OUString aText; - Image aImage; + SfxStyleFamily const nFamily; + OUString const aText; + Image const aImage; SfxStyleFilter aFilterList; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 802ef9bdb33b..4f18f9b91497 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -62,7 +62,7 @@ struct TabPageParent return pParent->GetFrameWeld(); } VclPtr<vcl::Window> pParent; - weld::Container* pPage; + weld::Container* const pPage; weld::DialogController* pController; }; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index c46c8b42fa6f..d524ba892400 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -46,9 +46,9 @@ typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uIn struct SfxTbxCtrlFactory { - SfxToolBoxControlCtor pCtor; - const std::type_info& nTypeId; - sal_uInt16 nSlotId; + SfxToolBoxControlCtor const pCtor; + const std::type_info& nTypeId; + sal_uInt16 const nSlotId; SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor, const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ): @@ -70,7 +70,7 @@ friend class SfxFrameStatusListener; bool m_bFloating; bool m_bCascading; Link<SfxPopupWindow*,void> m_aDeleteLink; - sal_uInt16 m_nId; + sal_uInt16 const m_nId; css::uno::Reference< css::frame::XFrame > const m_xFrame; rtl::Reference<SfxFrameStatusListener> m_xStatusListener; diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx index e2f86a4aa4c4..f7a19f64164f 100644 --- a/include/sfx2/templatecontaineritem.hxx +++ b/include/sfx2/templatecontaineritem.hxx @@ -15,7 +15,7 @@ class TemplateContainerItem final { public: - sal_uInt16 mnId; + sal_uInt16 const mnId; sal_uInt16 mnRegionId; OUString maTitle; std::vector<TemplateItemProperties> maTemplates; diff --git a/include/sfx2/templatedefaultview.hxx b/include/sfx2/templatedefaultview.hxx index 15bec26fa38a..35c437e7d95c 100644 --- a/include/sfx2/templatedefaultview.hxx +++ b/include/sfx2/templatedefaultview.hxx @@ -31,7 +31,6 @@ public: private: long mnItemMaxSize; - long mnTextHeight; }; #endif // INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index a5881e4d7820..ce2e64b828b7 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -67,7 +67,7 @@ public: private: - FILTER_APPLICATION mApp; + FILTER_APPLICATION const mApp; }; diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index f16d8393fbf6..e64b82ec23a2 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -39,7 +39,7 @@ public: private: OUString maPath; - BitmapEx maDefaultBitmap; + BitmapEx const maDefaultBitmap; bool mbIsDefaultTemplate; }; diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index dc7f7c84cb68..3568da70d31b 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -68,7 +68,7 @@ class SFX2_DLLPUBLIC ThumbnailViewItem public: ThumbnailView &mrParent; - sal_uInt16 mnId; + sal_uInt16 const mnId; bool mbVisible; bool mbSelected; bool mbHover; diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index e9bef0f6cc76..a24f436d7437 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.hxx @@ -51,8 +51,8 @@ public: OUString GetAPIViewName() const; private: - SfxViewCtor fnCreate; - SfxInterfaceId nOrd; + SfxViewCtor const fnCreate; + SfxInterfaceId const nOrd; const OUString m_sViewName; }; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index e8deab4891a6..053ff2513d8e 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -264,7 +264,7 @@ private: class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem { - SfxViewFrame* pFrame; + SfxViewFrame* const pFrame; public: SfxViewFrameItem( SfxViewFrame *pViewFrame ): |