diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-02 14:27:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-03 10:33:23 +0200 |
commit | 1e8f0940e6c6246e53550ac48eaae4f416e61777 (patch) | |
tree | 813a29491bf82b061cc574dc68b7a05f5764862a /svx | |
parent | 602c6097850d6d659b760bdb0dd83baa906d416c (diff) |
loplugin:constmethod in svx
Change-Id: I6ae7c04479e3ea8ecd7535c33224a5e7095b64bb
Reviewed-on: https://gerrit.libreoffice.org/78396
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
35 files changed, 64 insertions, 64 deletions
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 ) { |