diff options
68 files changed, 123 insertions, 123 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 9b7ff797f96b..75c38657bf9a 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -77,7 +77,7 @@ public: const AccessibleShapeTreeInfo& rShapeTreeInfo); virtual ~AccessibleControlShape( ) override; - const css::uno::Reference< css::beans::XPropertySet >& GetControlModel( ) { return m_xControlModel;} ; + const css::uno::Reference< css::beans::XPropertySet >& GetControlModel( ) const { return m_xControlModel;} AccessibleControlShape* GetLabeledByControlShape(); private: diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index a70f95edc086..ced35ca26e66 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -354,7 +354,7 @@ public: //===== Misc ======================================================== const css::uno::Reference< css::drawing::XShape >& - GetXShape() { return mxShape; } + GetXShape() const { return mxShape; } /** set the index _nIndex at the accessible shape @param _nIndex diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 4d130a56d813..e469b8df477c 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -322,7 +322,7 @@ namespace accessibility @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - sal_Int32 GetChildCount(); + sal_Int32 GetChildCount() const; /** Implements getAccessibleChild @attention Don't call with locked mutexes. You may hold diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 6e0009515710..433bb4a4aec0 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -187,7 +187,7 @@ public: Returns <true/> when there is a shape that has the focus and <false/> when there is no such shape. */ - bool HasFocus(); + bool HasFocus() const; /** When there is a shape that currently has the focus, i.e. <member>HasFocus()</member> returns <true/> then remove the diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx index 9ac53100b874..4f2df5e81e23 100644 --- a/include/svx/ColorSets.hxx +++ b/include/svx/ColorSets.hxx @@ -51,7 +51,7 @@ public: ~ColorSets(); void init(); - const std::vector<ColorSet>& getColorSets() + const std::vector<ColorSet>& getColorSets() const { return maColorSets; } diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index ea5e4fc1f1b3..87b9af0a7f11 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -181,9 +181,9 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet } }; - SAL_DLLPRIVATE bool IsFlipVert() { return bFlipV; }; - SAL_DLLPRIVATE bool IsFlipHorz() { return bFlipH; }; - SAL_DLLPRIVATE sal_Int32 GetRotateAngle() { return nRotateAngle; }; + SAL_DLLPRIVATE bool IsFlipVert() const { return bFlipV; }; + SAL_DLLPRIVATE bool IsFlipHorz() const { return bFlipH; }; + SAL_DLLPRIVATE sal_Int32 GetRotateAngle() const { return nRotateAngle; }; SdrObject* CreateLineGeometry(); SdrObject* CreateObject( bool bLineGeometryNeededOnly ); diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index e7c7cb1668bd..81621e436b0b 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -60,13 +60,13 @@ public: void ReloadRecentColorSet(ColorValueSet& rColorSet); std::vector<OUString> GetPaletteList(); void SetPalette( sal_Int32 nPos ); - sal_Int32 GetPalette(); - sal_Int32 GetPaletteCount() { return mnNumOfPalettes; } + sal_Int32 GetPalette() const; + sal_Int32 GetPaletteCount() const { return mnNumOfPalettes; } OUString GetPaletteName(); OUString GetSelectedPalettePath(); - long GetColorCount(); - long GetRecentColorCount(); + long GetColorCount() const; + long GetRecentColorCount() const; void AddRecentColor(const Color& rRecentColor, const OUString& rColorName, bool bFront = true); void SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 1db1442fa7fe..6d51b4a60b3b 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -99,7 +99,7 @@ public: virtual void Show() override { mxScrollArea->show(); } virtual void Hide() override { mxScrollArea->hide(); } - uno::Reference<css::accessibility::XAccessible> getAccessibleParent() { return GetDrawingArea()->get_accessible_parent(); } + uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } private: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index eaf980b78211..59fe0dd2c59b 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -81,10 +81,10 @@ private: void Compress(SvStream& aStream); - double GetViewWidthInch(); - double GetViewHeightInch(); + double GetViewWidthInch() const; + double GetViewHeightInch() const; - BmpScaleFlag GetSelectedInterpolationType(); + BmpScaleFlag GetSelectedInterpolationType() const; public: CompressGraphicsDialog( weld::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); @@ -94,7 +94,7 @@ public: SdrGrafObj* GetCompressedSdrGrafObj(); Graphic GetCompressedGraphic(); - tools::Rectangle GetScaledCropRectangle(); + tools::Rectangle GetScaledCropRectangle() const; }; #endif diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index ac1880bd56de..320b6db69421 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -58,7 +58,7 @@ public: virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; void SetAttributes( const SfxItemSet& rInAttrs ); - sal_uInt16 GetLineDeltaCount(); + sal_uInt16 GetLineDeltaCount() const; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index f501b71af1e3..b7726a75763c 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -203,7 +203,7 @@ public: void SetLastTime(const tools::Time &aTime); void SetDateMode(sal_uInt16 nMode); - SvxRedlinDateMode GetDateMode(); + SvxRedlinDateMode GetDateMode() const; void ClearAuthors(); void InsertAuthor( const OUString& rString ); @@ -220,11 +220,11 @@ public: void SetFocusToRange(); // } Methods for Calc - bool IsDate(); - bool IsAuthor(); - bool IsRange(); - bool IsAction(); - bool IsComment(); + bool IsDate() const; + bool IsAuthor() const; + bool IsRange() const; + bool IsAction() const; + bool IsComment() const; void ShowAction(bool bShow=true); diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 53976b86c606..9920a5a5f2b2 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -177,7 +177,7 @@ public: void SaveValue(); /** Compare value with the saved value */ - bool IsValueModified(); + bool IsValueModified() const; const OUString& GetText() const { return mpImpl->maText; } void SetText(const OUString& rText) { mpImpl->maText = rText; } diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index d979e5fda32f..4840363ea850 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -144,7 +144,7 @@ public: // selection checks bool IsSelectionValid(); - bool IsGeometrySelected() { return mbGeometrySelected; } + bool IsGeometrySelected() const { return mbGeometrySelected; } // get/set position of selected lamp in polar coordinates, Hor:[0..360.0[ and Ver:[-90..90] degrees void GetPosition(double& rHor, double& rVer); @@ -156,7 +156,7 @@ public: void SelectLight(sal_uInt32 nLightNumber); virtual void Set3DAttributes(const SfxItemSet& rAttr) override; - sal_uInt32 GetSelectedLight() { return maSelectedLight; } + sal_uInt32 GetSelectedLight() const { return maSelectedLight; } // light data access bool GetLightOnOff(sal_uInt32 nNum) const; @@ -218,7 +218,7 @@ public: // selection checks bool IsSelectionValid(); - bool IsGeometrySelected() { return mbGeometrySelected; } + bool IsGeometrySelected() const { return mbGeometrySelected; } // get/set position of selected lamp in polar coordinates, Hor:[0..360.0[ and Ver:[-90..90] degrees void GetPosition(double& rHor, double& rVer); @@ -230,7 +230,7 @@ public: void SelectLight(sal_uInt32 nLightNumber); virtual void Set3DAttributes(const SfxItemSet& rAttr) override; - sal_uInt32 GetSelectedLight() { return maSelectedLight; } + sal_uInt32 GetSelectedLight() const { return maSelectedLight; } // light data access bool GetLightOnOff(sal_uInt32 nNum) const; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index e682659367f0..3f31a827a35b 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -128,9 +128,9 @@ public: tools::Rectangle CalculateFocusRectangle() const; tools::Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; - css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() { return GetDrawingArea()->get_accessible_parent(); } + css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; - a11yrelationset get_accessible_relation_set() { return GetDrawingArea()->get_accessible_relation_set(); } + a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } RectPoint GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const; @@ -191,9 +191,9 @@ public: void SetPaintable( bool bTmp ) { bPaintable = bTmp; } void Reset(); - css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() { return GetDrawingArea()->get_accessible_parent(); } + css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; - a11yrelationset get_accessible_relation_set() { return GetDrawingArea()->get_accessible_relation_set(); } + a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } static long GetSquares() { return nSquares ; } long GetWidth() const { return aRectSize.getWidth() ; } diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 2222ad1d7d71..13cb3a9573f2 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -155,9 +155,9 @@ public: // accessibility - css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() { return GetDrawingArea()->get_accessible_parent(); } + css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; - a11yrelationset get_accessible_relation_set() { return GetDrawingArea()->get_accessible_relation_set(); } + a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } /** Returns the accessibility child object of the specified frame border (if enabled). */ rtl::Reference< a11y::AccFrameSelectorChild > diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index 515f070717c8..63b44992d370 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -47,7 +47,7 @@ public: void connect_changed(const Link<weld::Entry&, void>& rLink) { m_aModifyHdl = rLink; } void SetColor( ::Color nColor ); - ::Color GetColor(); + ::Color GetColor() const; }; } diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index c0d61ea92d28..251fb9dceace 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -136,9 +136,9 @@ class SVX_DLLPUBLIC NBOTypeMgrBase // store the attributes passed from pSet void SetItems(const SfxItemSet* pArg); protected: - const OUString& GetBulletCharFmtName() { return aBulletCharFmtName;} - const OUString& GetNumCharFmtName() { return aNumCharFmtName;} - MapUnit GetMapUnit() { return eCoreUnit;} + const OUString& GetBulletCharFmtName() const { return aBulletCharFmtName;} + const OUString& GetNumCharFmtName() const { return aNumCharFmtName;} + MapUnit GetMapUnit() const { return eCoreUnit;} protected: void ImplLoad(const OUString& filename); void ImplStore(const OUString& filename); diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 5e3e54cd754c..9dc0b2b5c598 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -160,7 +160,7 @@ public: void SetComment4Entry(short nEntry, const OUString& aCommentString); void SetCurrencySymbol(sal_uInt32 nPos); - sal_uInt32 GetCurrencySymbol() { return nCurCurrencyEntryPos;} + sal_uInt32 GetCurrencySymbol() const { return nCurCurrencyEntryPos;} sal_uInt16 FindCurrencyFormat( const OUString& rFmtString ); sal_uInt16 FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,bool bTmpBanking); void SetCurCurrencyEntry(NfCurrencyEntry*); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 048ac3365dd9..1441d3055734 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -189,8 +189,8 @@ public: sal_uInt16 GetActColumn() const { return nActColumn;} bool IsFirstAct() const; bool IsLastAct() const; - long GetLeft() { return nLeft;} - long GetRight() { return nRight;} + long GetLeft() const { return nLeft;} + long GetRight() const { return nRight;} bool IsTable() const { return bTable;} bool CalcOrtho() const; void SetOrtho(bool bVal); diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 1ab5c7a92237..59aba43460ca 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -73,7 +73,7 @@ namespace sdr virtual void Invoke() override; // get time - SAL_DLLPRIVATE sal_uInt32 GetTime() { return mnTime; } + SAL_DLLPRIVATE sal_uInt32 GetTime() const { return mnTime; } // #i38135# SAL_DLLPRIVATE void SetTime(sal_uInt32 nTime); diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 918fa5a323d1..1c8e6e214d28 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -53,7 +53,7 @@ public: SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) override; SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override; - SVX_DLLPRIVATE bool HasMarked(); + SVX_DLLPRIVATE bool HasMarked() const; SVX_DLLPRIVATE virtual bool DeleteMarked() override; SVX_DLLPRIVATE virtual void onSelectionHasChanged() override; diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 60a06bd546c5..827758e177a9 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -61,7 +61,7 @@ public: // check from outside if we are inside a callback for ending text edit. This // is needed to detect inside end text edit if it is a regular one or triggered // by a last undo during text edit - bool isEndTextEditTriggeredFromUndo() { return mbEndTextEditTriggeredFromUndo; } + bool isEndTextEditTriggeredFromUndo() const { return mbEndTextEditTriggeredFromUndo; } void SetDocShell(SfxObjectShell* pDocShell); }; diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx index 5b315aa3a928..1c8f58d1cc81 100644 --- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx +++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx @@ -52,7 +52,7 @@ public: The activated context. */ static void NotifyContextChange ( - SfxViewShell* pViewShell, + const SfxViewShell* pViewShell, const vcl::EnumContext::Context eContext); private: diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index ee006adc03df..3e3a73f92815 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -127,7 +127,7 @@ public: void SetDocWin(vcl::Window* pDocWin); void SetSrchFlag( bool bSuccess ) { mbSuccess = bSuccess; } - bool GetSrchFlag() { return mbSuccess; } + bool GetSrchFlag() const { return mbSuccess; } void SetSaveToModule(bool b); void SetSearchLabel(const OUString& rStr); @@ -254,7 +254,7 @@ private: SVX_DLLPRIVATE void SaveToModule_Impl(); SVX_DLLPRIVATE void ApplyTransliterationFlags_Impl( TransliterationFlags nSettings ); - SVX_DLLPRIVATE bool IsOtherOptionsExpanded(); + SVX_DLLPRIVATE bool IsOtherOptionsExpanded() const; SVX_DLLPRIVATE short executeSubDialog(VclAbstractDialog * dialog); }; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 4856adecc27f..f5759d6b9083 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -193,7 +193,7 @@ public: void Show(); void Hide(); - bool IsShiftPressed() { return mbShiftPressed; } + bool IsShiftPressed() const { return mbShiftPressed; } void SetShiftPressed(bool bShiftPressed) { mbShiftPressed = bShiftPressed; } virtual void TakeSdrDragComment(OUString& rStr) const=0; virtual bool BeginSdrDrag()=0; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 27cf5571e2b1..f7ffa515a0e0 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -536,7 +536,7 @@ public: void SetStyleSheetPool(SfxStyleSheetBasePool* pPool) { mxStyleSheetPool=pPool; } void SetStarDrawPreviewMode(bool bPreview); - bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } + bool IsStarDrawPreviewMode() const { return bStarDrawPreviewMode; } bool GetDisableTextEditUsesCommonUndoManager() const { return mbDisableTextEditUsesCommonUndoManager; } void SetDisableTextEditUsesCommonUndoManager(bool bNew) { mbDisableTextEditUsesCommonUndoManager = bNew; } diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 662ddb5d446b..32f9b0e49577 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -247,7 +247,7 @@ public: using SdrTextObj::NbcSetOutlinerParaObject; - OUString GetCustomShapeName(); + OUString GetCustomShapeName() const; }; #endif // INCLUDED_SVX_SVDOASHP_HXX diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 0b1e5c3a832b..61faabb2e4ea 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -451,7 +451,7 @@ public: // @return // If no navigation position has been explicitly defined then the // result of GetOrdNum() is returned. - sal_uInt32 GetNavigationPosition(); + sal_uInt32 GetNavigationPosition() const; // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and sometimes problematic (inside a bigger object change You will get diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 54858894baa3..4235b69351a3 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -220,7 +220,7 @@ public: // Access to GrafAnimationAllowed flag void SetGrafAnimationAllowed(bool bNew); - css::uno::Reference< css::io::XInputStream > getInputStream(); + css::uno::Reference< css::io::XInputStream > getInputStream() const; // #i103116# FullDrag support virtual SdrObject* getFullDragClone() const override; diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 9be379430316..8676d8d1c2b1 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -67,7 +67,7 @@ public: css::uno::Reference< css::graphic::XGraphic > const & getSnapshot() const; css::uno::Reference< css::io::XInputStream> - GetInputStream(); + GetInputStream() const; void SetInputStream(css::uno::Reference<css::io::XInputStream> const&); virtual bool shouldKeepAspectRatio() const override { return true; } diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 4522f02f790c..e4d6ccbce9a1 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -243,7 +243,7 @@ protected: SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect); virtual ~SdrUndoObjList() override; - bool IsOwner() { return bOwner; } + bool IsOwner() const { return bOwner; } void SetOwner(bool bNew); }; @@ -341,10 +341,10 @@ public: virtual void Undo() override; virtual void Redo() override; - bool IsNewOwner() { return bNewOwner; } + bool IsNewOwner() const { return bNewOwner; } void SetNewOwner(bool bNew); - bool IsOldOwner() { return bOldOwner; } + bool IsOldOwner() const { return bOldOwner; } void SetOldOwner(bool bNew); }; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 034bf20c1c6c..94ee827c3559 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -197,7 +197,7 @@ private: friend class SfxStyleControllerItem_Impl; SVX_DLLPRIVATE void SetFamilyState(sal_uInt16 nIdx, const SfxTemplateItem* pItem); - SVX_DLLPRIVATE SfxStyleFamily GetActFamily(); + SVX_DLLPRIVATE SfxStyleFamily GetActFamily() const; }; typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction; diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 4a0c9ddaeb15..cf0b70b96630 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -75,7 +75,7 @@ public: // Get/Set Event void SetMouseEvent(const MouseEvent& rNew) { aMouseEvent = rNew; } - const MouseEvent& GetMouseEvent() { return aMouseEvent; } + const MouseEvent& GetMouseEvent() const { return aMouseEvent; } // Override getting the model, as we need to supply a Scene together with individual 3D Objects. virtual std::unique_ptr<SdrModel> CreateMarkedObjModel() const override; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 208f65945155..68a0e40cff9f 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -100,7 +100,7 @@ namespace accessibility virtual ~AccessibleTextHelper_Impl() override; // XAccessibleContext child handling methods - sal_Int32 getAccessibleChildCount(); + sal_Int32 getAccessibleChildCount() const; uno::Reference< XAccessible > getAccessibleChild( sal_Int32 i ); // XAccessibleEventBroadcaster child related methods @@ -997,18 +997,18 @@ namespace accessibility @return number of changed paragraphs, -1 for "every paragraph changed" */ - sal_Int32 GetNumberOfParasChanged() { return mnParasChanged; } + sal_Int32 GetNumberOfParasChanged() const { return mnParasChanged; } /** Query index of last added/removed paragraph @return index of lastly added paragraphs, -1 for none added so far. */ - sal_Int32 GetParaIndex() { return mnParaIndex; } + sal_Int32 GetParaIndex() const { return mnParaIndex; } /** Query hint id of last interesting event @return hint id of last interesting event (REMOVED/INSERTED). */ - SfxHintId GetHintId() { return mnHintId; } + SfxHintId GetHintId() const { return mnHintId; } private: /** number of paragraphs changed during queue processing. -1 for @@ -1431,7 +1431,7 @@ namespace accessibility } // XAccessibleContext - sal_Int32 AccessibleTextHelper_Impl::getAccessibleChildCount() + sal_Int32 AccessibleTextHelper_Impl::getAccessibleChildCount() const { return mnLastVisibleChild - mnFirstVisibleChild + 1; } @@ -1698,7 +1698,7 @@ namespace accessibility } // XAccessibleContext - sal_Int32 AccessibleTextHelper::GetChildCount() + sal_Int32 AccessibleTextHelper::GetChildCount() const { SolarMutexGuard aGuard; diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 7bc2e8f7725b..e92f7b2fdd68 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -100,7 +100,7 @@ void ChildrenManager::UpdateSelection() mpImpl->UpdateSelection (); } -bool ChildrenManager::HasFocus() +bool ChildrenManager::HasFocus() const { return mpImpl->HasFocus (); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 2c0b953dc459..935c5bb2ea37 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -958,7 +958,7 @@ void ChildrenManagerImpl::UpdateSelection() } -bool ChildrenManagerImpl::HasFocus() +bool ChildrenManagerImpl::HasFocus() const { return mpFocusedShape != nullptr; } diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index f0abbfdff22c..4812bf9e4745 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -225,7 +225,7 @@ public: Returns <true/> when there is a shape that has the focus and <false/> when there is no such shape. */ - bool HasFocus(); + bool HasFocus() const; /** When there is a shape that currently has the focus, i.e. <member>HasFocus()</member> returns <true/> then remove the diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 2b180cf9a8ae..ab0ecabbc109 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -462,7 +462,7 @@ awt::Rectangle SvxPixelCtlAccessibleChild::implGetBounds() return AWTRectangle(maBoundingBox); } -OUString SvxPixelCtlAccessibleChild::GetName() +OUString SvxPixelCtlAccessibleChild::GetName() const { sal_Int32 nXIndex = mnIndexInParent % SvxPixelCtl::GetLineCount(); sal_Int32 nYIndex = mnIndexInParent / SvxPixelCtl::GetLineCount(); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 9ff539f43e16..ee0331987c65 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1193,7 +1193,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r return bRetValue; } -static double lcl_getXAdjustmentValue(OUString& rShapeType, const sal_uInt32 nHandleIndex, +static double lcl_getXAdjustmentValue(const OUString& rShapeType, const sal_uInt32 nHandleIndex, const double fX, const double fW, const double fH) { // degenerated shapes are not worth to calculate special case for each shape type @@ -1300,7 +1300,7 @@ static double lcl_getXAdjustmentValue(OUString& rShapeType, const sal_uInt32 nHa return fX; // method is unknown } -static double lcl_getYAdjustmentValue(OUString& rShapeType, const sal_uInt32 nHandleIndex, +static double lcl_getYAdjustmentValue(const OUString& rShapeType, const sal_uInt32 nHandleIndex, const double fY, const double fW, const double fH) { // degenerated shapes are not worth to calculate a special case for each shape type diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index dcde367c383c..df4e08b3ca7a 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -218,17 +218,17 @@ void CompressGraphicsDialog::UpdateResolutionLB() m_xResolutionLB->set_entry_text( OUString::number( static_cast<sal_Int32>(m_dResolution) ) ); } -double CompressGraphicsDialog::GetViewWidthInch() +double CompressGraphicsDialog::GetViewWidthInch() const { return static_cast<double>(MetricField::ConvertValue(m_aViewSize100mm.Width(), 2, MapUnit::Map100thMM, FieldUnit::INCH)) / 100.0; } -double CompressGraphicsDialog::GetViewHeightInch() +double CompressGraphicsDialog::GetViewHeightInch() const { return static_cast<double>(MetricField::ConvertValue(m_aViewSize100mm.Height(), 2, MapUnit::Map100thMM, FieldUnit::INCH)) / 100.0; } -BmpScaleFlag CompressGraphicsDialog::GetSelectedInterpolationType() +BmpScaleFlag CompressGraphicsDialog::GetSelectedInterpolationType() const { OUString aSelectionText = m_xInterpolationCombo->get_active_text(); @@ -366,7 +366,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl, weld::Button&, void } } -tools::Rectangle CompressGraphicsDialog::GetScaledCropRectangle() +tools::Rectangle CompressGraphicsDialog::GetScaledCropRectangle() const { if ( m_xReduceResolutionCB->get_active() ) { diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 22c7c831f6a8..899932fff11c 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -241,7 +241,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs ) // Get number of lines which are offset based on the preview object -sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount() +sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount() const { const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 18c7cd44e1fb..1c51696b570a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -649,7 +649,7 @@ void SvxTPFilter::SetDateMode(sal_uInt16 nMode) SelDateHdl(*m_xLbDate); } -SvxRedlinDateMode SvxTPFilter::GetDateMode() +SvxRedlinDateMode SvxTPFilter::GetDateMode() const { return static_cast<SvxRedlinDateMode>(m_xLbDate->get_active()); } @@ -721,27 +721,27 @@ OUString SvxTPFilter::GetComment()const return m_xEdComment->get_text(); } -bool SvxTPFilter::IsDate() +bool SvxTPFilter::IsDate() const { return m_xCbDate->get_active(); } -bool SvxTPFilter::IsAuthor() +bool SvxTPFilter::IsAuthor() const { return m_xCbAuthor->get_active(); } -bool SvxTPFilter::IsRange() +bool SvxTPFilter::IsRange() const { return m_xCbRange->get_active(); } -bool SvxTPFilter::IsAction() +bool SvxTPFilter::IsAction() const { return m_xCbAction->get_active(); } -bool SvxTPFilter::IsComment() +bool SvxTPFilter::IsComment() const { return m_xCbComment->get_active(); } diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 50f65ed2a0be..38eff084cdf3 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -634,7 +634,7 @@ void SvxDialControl::SaveValue() mpImpl->mnInitialAngle = mpImpl->mnAngle; } -bool SvxDialControl::IsValueModified() +bool SvxDialControl::IsValueModified() const { return mpImpl->mnInitialAngle != mpImpl->mnAngle; } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index e5ad2666e609..0039c0fad917 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -75,7 +75,7 @@ RecoveryCore::~RecoveryCore() } -const css::uno::Reference< css::uno::XComponentContext >& RecoveryCore::getComponentContext() +const css::uno::Reference< css::uno::XComponentContext >& RecoveryCore::getComponentContext() const { return m_xContext; } @@ -1065,12 +1065,12 @@ void BrokenRecoveryDialog::impl_refresh() m_xOkBtn->grab_focus(); } -bool BrokenRecoveryDialog::isExecutionNeeded() +bool BrokenRecoveryDialog::isExecutionNeeded() const { return m_bExecutionNeeded; } -const OUString& BrokenRecoveryDialog::getSaveDirURL() +const OUString& BrokenRecoveryDialog::getSaveDirURL() const { return m_sSavePath; } diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx index f1c071547ff0..a387a427687d 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/svx/source/dialog/hexcolorcontrol.cxx @@ -66,7 +66,7 @@ void HexColorControl::SetColor(Color nColor) m_xEntry->set_text(sColor); } -Color HexColorControl::GetColor() +Color HexColorControl::GetColor() const { sal_Int32 nColor = -1; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 0aa6b26e1819..bc751ab885d3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -564,7 +564,7 @@ void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags nSett } -bool SvxSearchDialog::IsOtherOptionsExpanded() +bool SvxSearchDialog::IsOtherOptionsExpanded() const { return m_xReplaceBackwardsCB->get_active() || m_xSelectionBtn->get_active() || diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 8168ff718df1..e8966b1d97c4 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2277,7 +2277,7 @@ namespace svxform Check(&rBox); } - void AddDataItemDialog::Check(weld::ToggleButton* pBox) + void AddDataItemDialog::Check(const weld::ToggleButton* pBox) { // Condition buttons are only enable if their check box is checked m_xReadonlyBtn->set_sensitive( m_xReadonlyCB->get_active() ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2d42276f187e..0a1f936f8765 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1370,7 +1370,7 @@ void FmXFormShell::LoopGrids_Lock(LoopGridsSync nSync, LoopGridsFlags nFlags) } -Reference< XControlContainer > FmXFormShell::getControlContainerForView_Lock() +Reference< XControlContainer > FmXFormShell::getControlContainerForView_Lock() const { if (impl_checkDisposed_Lock()) return nullptr; diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index f0791453ca96..825d773801af 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -122,7 +122,7 @@ public: virtual void dispose() override; void SelectTheme( sal_uInt16 nThemePos ) { mpThemes->SelectEntryPos( nThemePos ); SelectThemeHdl( *mpThemes ); } - OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetSelectedEntry() : OUString(); } + OUString GetSelectedTheme() const { return mpThemes->GetEntryCount() ? mpThemes->GetSelectedEntry() : OUString(); } void ShowContextMenu(); bool KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ); diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx index 93959e210256..b0819469714c 100644 --- a/svx/source/inc/cell.hxx +++ b/svx/source/inc/cell.hxx @@ -61,8 +61,8 @@ public: SVX_DLLPRIVATE void dispose(); // SdrTextShape proxy - bool IsActiveCell(); - bool IsTextEditActive(); + bool IsActiveCell() const; + bool IsTextEditActive() const; SVX_DLLPRIVATE bool hasText() const; SVX_DLLPRIVATE void cloneFrom( const CellRef& rCell ); @@ -81,7 +81,7 @@ public: void SetMergedItem(const SfxPoolItem& rItem); SVX_DLLPRIVATE sal_Int32 calcPreferredWidth( const Size aSize ); - SVX_DLLPRIVATE sal_Int32 getMinimumWidth(); + SVX_DLLPRIVATE sal_Int32 getMinimumWidth() const; SVX_DLLPRIVATE sal_Int32 getMinimumHeight(); SVX_DLLPRIVATE long GetTextLeftDistance() const; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index a03e80a4af06..a1e4a66de53d 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -416,7 +416,7 @@ namespace svxform std::unique_ptr<weld::Button> m_xCalculateBtn; std::unique_ptr<weld::Button> m_xOKBtn; - void Check(weld::ToggleButton* pBox); + void Check(const weld::ToggleButton* pBox); DECL_LINK(CheckHdl, weld::ToggleButton&, void); DECL_LINK(ConditionHdl, weld::Button&, void); DECL_LINK(OKHdl, weld::Button&, void); diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 22cb6799be7d..48014e6cdd63 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -221,7 +221,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener /** @short TODO */ - const css::uno::Reference< css::uno::XComponentContext >& getComponentContext(); + const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const; /** @short TODO */ @@ -471,11 +471,11 @@ public: virtual ~BrokenRecoveryDialog() override; /** @short TODO */ - bool isExecutionNeeded(); + bool isExecutionNeeded() const; /** @short TODO */ - const OUString& getSaveDirURL(); + const OUString& getSaveDirURL() const; // helper diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index cac94f4a159a..6011ace3eb17 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -106,10 +106,10 @@ public: } const css::uno::Reference< css::form::runtime::XFormController >& - GetController() { return m_xController; } + GetController() const { return m_xController; } const css::uno::Reference< css::form::runtime::XFilterController >& - GetFilterController() { return m_xFilterController; } + GetFilterController() const { return m_xFilterController; } virtual Image GetImage() const override; }; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 334ab071093d..dd60783d9fa8 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -287,7 +287,7 @@ private: public: SAL_DLLPRIVATE void EnableTrackProperties_Lock(bool bEnable) { m_bTrackProperties = bEnable; } - SAL_DLLPRIVATE bool IsTrackPropertiesEnabled_Lock() { return m_bTrackProperties; } + SAL_DLLPRIVATE bool IsTrackPropertiesEnabled_Lock() const { return m_bTrackProperties; } // activation handling SAL_DLLPRIVATE void viewActivated_Lock(FmFormView& _rCurrentView, bool _bSyncAction = false); @@ -444,7 +444,7 @@ public: // Setting the curObject/selObject/curForm is delayed (SetSelectionDelayed). With the // following functions this can be inquired/enforced. - SAL_DLLPRIVATE inline bool IsSelectionUpdatePending_Lock(); + SAL_DLLPRIVATE inline bool IsSelectionUpdatePending_Lock() const; SAL_DLLPRIVATE void ForceUpdateSelection_Lock(); SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel> getContextDocument_Lock() const; @@ -483,7 +483,7 @@ private: SAL_DLLPRIVATE void implAdjustConfigCache_Lock(); SAL_DLLPRIVATE css::uno::Reference< css::awt::XControlContainer > - getControlContainerForView_Lock(); + getControlContainerForView_Lock() const; /** finds and sets a default for m_xCurrentForm, if it is currently NULL */ @@ -529,7 +529,7 @@ private: }; -inline bool FmXFormShell::IsSelectionUpdatePending_Lock() +inline bool FmXFormShell::IsSelectionUpdatePending_Lock() const { return m_aMarkTimer.IsActive(); } diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 5696e8291f33..2c0bb54fad90 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -112,7 +112,7 @@ public: // XFormControllerContext virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& Control ) override; - const ::std::vector< css::uno::Reference< css::form::runtime::XFormController > >& GetList() {return m_aControllerList;} + const ::std::vector< css::uno::Reference< css::form::runtime::XFormController > >& GetList() const {return m_aControllerList;} private: virtual ~FormViewPageWindowAdapter() override; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 40b48d90aa8c..29ee940e7442 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -93,7 +93,7 @@ public: void CheckChild(); void SelectChild( bool bSelect); void ChangePixelColorOrBG(bool bPixelColorOrBG){ m_bPixelColorOrBG = bPixelColorOrBG ;} - OUString GetName(); + OUString GetName() const; private: virtual ~SvxPixelCtlAccessibleChild() override; diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 0c53ae140629..321a56c5024e 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -61,7 +61,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( void ContextChangeEventMultiplexer::NotifyContextChange ( - SfxViewShell* pViewShell, + const SfxViewShell* pViewShell, const vcl::EnumContext::Context eContext) { if (pViewShell != nullptr) diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index 1e60de09e73c..7912b2476be5 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -33,7 +33,7 @@ public: void SetUnit(std::array<OUString,9> const & strUnits); void SetSelItem(sal_uInt16 nSel); - sal_uInt16 GetSelItem() { return nSelItem;} + sal_uInt16 GetSelItem() const { return nSelItem;} void SetImage(const Image& img); void SetCusEnable(bool bEnable); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 4e2287812f5e..9f69bfdb7148 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -38,7 +38,7 @@ public: virtual ~TextCharacterSpacingControl() override; virtual void dispose() override; - long GetLastCustomValue() { return mnCustomKern;} + long GetLastCustomValue() const { return mnCustomKern;} private: VclPtr<MetricField> maEditKerning; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 843cf14fba12..70c523de5c56 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3113,7 +3113,7 @@ void SdrObjCustomShape::impl_setUnoShape(const uno::Reference<uno::XInterface>& mxCustomShapeEngine.set(nullptr); } -OUString SdrObjCustomShape::GetCustomShapeName() +OUString SdrObjCustomShape::GetCustomShapeName() const { OUString sShapeName; OUString aEngine( GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ).GetValue() ); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 9d27cc4c3387..d35bdf8745e5 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -855,7 +855,7 @@ void SdrObject::SetGrabBagItem(const css::uno::Any& rVal) BroadcastObjectChange(); } -sal_uInt32 SdrObject::GetNavigationPosition() +sal_uInt32 SdrObject::GetNavigationPosition() const { if (nullptr != getParentSdrObjListFromSdrObject() && getParentSdrObjListFromSdrObject()->RecalcNavigationPositions()) { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 8c3c8adf7ccc..cbf3c055578b 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1136,7 +1136,7 @@ void SdrGrafObj::SetGrafAnimationAllowed(bool bNew) } } -Reference< XInputStream > SdrGrafObj::getInputStream() +Reference< XInputStream > SdrGrafObj::getInputStream() const { Reference< XInputStream > xStream; diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index e6a20c8c99ac..abb8a70fa8a9 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -245,7 +245,7 @@ const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const return m_xImpl->m_MediaProperties; } -uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() +uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() const { if (!m_xImpl->m_pTempFile) { diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 780b68625fd6..e3fc510dbfcd 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -72,7 +72,7 @@ public: virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; virtual OUString SAL_CALL getAccessibleName() override; - const sdr::table::CellRef& getCellRef() { return mxCell;} + const sdr::table::CellRef& getCellRef() const { return mxCell;} void UpdateChildren(); static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 81d78bec4ff5..8f465828352a 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -580,7 +580,7 @@ void Cell::notifyModified() // SdrTextShape proxy -bool Cell::IsActiveCell() +bool Cell::IsActiveCell() const { bool isActive = false; SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -590,7 +590,7 @@ bool Cell::IsActiveCell() return isActive; } -bool Cell::IsTextEditActive() +bool Cell::IsTextEditActive() const { bool isActive = false; SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -728,7 +728,7 @@ sal_Int32 Cell::calcPreferredWidth( const Size aSize ) return GetTextLeftDistance() + GetTextRightDistance() + nPreferredWidth; } -sal_Int32 Cell::getMinimumWidth() +sal_Int32 Cell::getMinimumWidth() const { return GetTextLeftDistance() + GetTextRightDistance() + 100; } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index fd81047b4901..4bb15a495ce0 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1363,7 +1363,7 @@ void SvxTableController::DistributeRows(const bool bOptimize, const bool bMinimi rModel.EndUndo(); } -bool SvxTableController::HasMarked() +bool SvxTableController::HasMarked() const { return mbCellSelectionMode && mxTable.is(); } diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index a62d6f0a5831..0dba161ef7fd 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -274,7 +274,7 @@ void PaletteManager::SetPalette( sal_Int32 nPos ) } } -sal_Int32 PaletteManager::GetPalette() +sal_Int32 PaletteManager::GetPalette() const { return mnCurrentPalette; } @@ -303,12 +303,12 @@ OUString PaletteManager::GetSelectedPalettePath() return OUString(); } -long PaletteManager::GetColorCount() +long PaletteManager::GetColorCount() const { return mnColorCount; } -long PaletteManager::GetRecentColorCount() +long PaletteManager::GetRecentColorCount() const { return maRecentColors.size(); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 7028a3afc53c..51b746694a7d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -232,7 +232,7 @@ public: void FillList(); void Update( const css::awt::FontDescriptor* pFontDesc ); - sal_uInt16 GetListCount() { return nFtCount; } + sal_uInt16 GetListCount() const { return nFtCount; } void Clear() { FontNameBox::Clear(); nFtCount = 0; } void Fill( const FontList* pList ) { FontNameBox::Fill( pList ); @@ -2958,7 +2958,7 @@ void SAL_CALL SvxStyleToolBoxControl::update() } } -SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() +SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() const { switch ( nActFamily-1 + SID_STYLE_FAMILY_START ) { |