diff options
49 files changed, 81 insertions, 78 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 49e9c3759f6d..b999767aaeb1 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -206,7 +206,7 @@ private: SbxBase* ImplGetSBXForEntry(const weld::TreeIter& rEntry, bool& rbArrayElement); - void implEnableChildren(weld::TreeIter& rEntry, bool bEnable); + void implEnableChildren(const weld::TreeIter& rEntry, bool bEnable); DECL_STATIC_LINK(WatchWindow, ButtonHdl, weld::Button&, void); DECL_LINK(TreeListHdl, weld::TreeView&, void); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 8c2f9514843b..391a8fe0a91e 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2341,7 +2341,7 @@ OUString implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eType ) } // namespace -void WatchWindow::implEnableChildren(weld::TreeIter& rEntry, bool bEnable) +void WatchWindow::implEnableChildren(const weld::TreeIter& rEntry, bool bEnable) { if (bEnable) { diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx index af1ae2301901..b23fc28f7199 100644 --- a/chart2/source/controller/inc/CommandDispatchContainer.hxx +++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx @@ -102,7 +102,7 @@ public: const css::uno::Reference< css::frame::XController > & xChartController, const css::util::URL & rURL ); - css::uno::Reference< css::frame::XDispatch > getChartDispatcher() { return m_xChartDispatcher; } + css::uno::Reference< css::frame::XDispatch > getChartDispatcher() const { return m_xChartDispatcher; } void setDrawCommandDispatch( DrawCommandDispatch* pDispatch ); DrawCommandDispatch* getDrawCommandDispatch() { return m_pDrawCommandDispatch; } diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index c5db392cf34f..e9b22500b6fa 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -30,7 +30,7 @@ namespace chart::sidebar { namespace { -SvxColorToolBoxControl* getColorToolBoxControl(ToolbarUnoDispatcher& rColorDispatch) +SvxColorToolBoxControl* getColorToolBoxControl(const ToolbarUnoDispatcher& rColorDispatch) { css::uno::Reference<css::frame::XToolbarController> xController = rColorDispatch.GetControllerForCommand(".uno:FillColor"); SvxColorToolBoxControl* pToolBoxColorControl = dynamic_cast<SvxColorToolBoxControl*>(xController.get()); diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 8c4ef5e39ca9..cb0b04d07741 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -32,14 +32,14 @@ namespace chart::sidebar { namespace { -SvxLineStyleToolBoxControl* getLineStyleToolBoxControl(ToolbarUnoDispatcher& rToolBoxColor) +SvxLineStyleToolBoxControl* getLineStyleToolBoxControl(const ToolbarUnoDispatcher& rToolBoxColor) { css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxColor.GetControllerForCommand(".uno:XLineStyle"); SvxLineStyleToolBoxControl* pToolBoxLineStyleControl = dynamic_cast<SvxLineStyleToolBoxControl*>(xController.get()); return pToolBoxLineStyleControl; } -SvxColorToolBoxControl* getColorToolBoxControl(ToolbarUnoDispatcher& rToolBoxLineStyle) +SvxColorToolBoxControl* getColorToolBoxControl(const ToolbarUnoDispatcher& rToolBoxLineStyle) { css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxLineStyle.GetControllerForCommand(".uno:XLineColor"); SvxColorToolBoxControl* pToolBoxColorControl = dynamic_cast<SvxColorToolBoxControl*>(xController.get()); diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 710e46c756b6..51bc102694b7 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -242,7 +242,7 @@ public: void setCoordinateSystemResolution( const css::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); bool PointsWereSkipped() const { return m_bPointsWereSkipped;} void setPieLabelsAllowToMove( bool bIsPieOrDonut ) { m_bPieLabelsAllowToMove = bIsPieOrDonut; }; - void setAvailableOuterRect( basegfx::B2IRectangle& aAvailableOuterRect ) { m_aAvailableOuterRect = aAvailableOuterRect; }; + void setAvailableOuterRect( const basegfx::B2IRectangle& aAvailableOuterRect ) { m_aAvailableOuterRect = aAvailableOuterRect; }; //return the depth for a logic 1 double getTransformedDepth() const; diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index 58b4aa0c15ed..35cb7ce0713e 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -199,7 +199,7 @@ void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(const OUString& sClassId, const OUString& sUIItemId, const OUString& sUIItemCommand, weld::TreeView& rTreeView, - weld::TreeIter& rIter) + const weld::TreeIter& rIter) { css::uno::Reference<css::container::XNameAccess> m_xCommandToLabelMap; uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext(); diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index dd33d2c24782..ebd23ba077d9 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -600,7 +600,7 @@ bool AdditionsDialog::sortByDownload(const AdditionInfo& a, const AdditionInfo& } AdditionsItem::AdditionsItem(weld::Widget* pParent, AdditionsDialog* pParentDialog, - AdditionInfo& additionInfo) + const AdditionInfo& additionInfo) : m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/additionsfragment.ui")) , m_xContainer(m_xBuilder->weld_widget("additionsEntry")) , m_xImageScreenshot(m_xBuilder->weld_image("imageScreenshot")) diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 9efaad017af7..9596ed16955a 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -114,7 +114,7 @@ class AdditionsItem { public: AdditionsItem(weld::Widget* pParent, AdditionsDialog* pParentDialog, - AdditionInfo& additionInfo); + const AdditionInfo& additionInfo); bool getExtensionFile(OUString& sExtensionFile); DECL_LINK(ShowMoreHdl, weld::Button&, void); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index f72f15fa6619..5f023e046310 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -458,7 +458,7 @@ protected: void InsertEntryIntoNotebookbarTabUI(const OUString& sClassId, const OUString& sUIItemId, const OUString& sUIItemCommand, - weld::TreeView& rTreeView, weld::TreeIter& rIter); + weld::TreeView& rTreeView, const weld::TreeIter& rIter); SvxEntries* FindParentForChild( SvxEntries* pParentEntries, SvxConfigEntry* pChildData ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 1d1a023445ae..aef0eaba350f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -401,7 +401,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< OUString>& _aNames) } } -OUString OAppDetailPageHelper::getQualifiedName(weld::TreeIter* _pEntry) const +OUString OAppDetailPageHelper::getQualifiedName(const weld::TreeIter* _pEntry) const { int nPos = getVisibleControlIndex(); OUString sComposedName; @@ -633,7 +633,7 @@ namespace } void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType, - const OUString& rImageId, weld::TreeIter* _pParent ) + const OUString& rImageId, const weld::TreeIter* _pParent ) { OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF"); OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 6268f713eb43..03107f5ecf8b 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -125,7 +125,7 @@ namespace dbaui void fillNames( const css::uno::Reference< css::container::XNameAccess >& _xContainer, const ElementType _eType, const OUString& rImageId, - weld::TreeIter* _pParent ); + const weld::TreeIter* _pParent ); /** sets the detail page @param rTreeView @@ -240,7 +240,7 @@ namespace dbaui @return the qualified name */ - OUString getQualifiedName( weld::TreeIter* _pEntry ) const; + OUString getQualifiedName( const weld::TreeIter* _pEntry ) const; /// return the element of currently select entry ElementType getElementType() const; diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 23011330a7e8..57a4f3038448 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -325,7 +325,7 @@ const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _e return rData; } -OUString OApplicationDetailView::getQualifiedName(weld::TreeIter* _pEntry) const +OUString OApplicationDetailView::getQualifiedName(const weld::TreeIter* _pEntry) const { return GetControlHelper()->getQualifiedName( _pEntry ); } diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 977bd015be02..58b382800865 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -146,7 +146,7 @@ namespace dbaui @return the qualified name */ - OUString getQualifiedName(weld::TreeIter* _pEntry) const; + OUString getQualifiedName(const weld::TreeIter* _pEntry) const; /** returns if an entry is a leaf @param rTreeView diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index dbe4e77abd53..be384b2d9076 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -51,7 +51,7 @@ weld::Container* OTitleWindow::getChildContainer() return m_xChildContainer.get(); } -void OTitleWindow::setChildWindow(std::shared_ptr<OChildWindow>& rChild) +void OTitleWindow::setChildWindow(const std::shared_ptr<OChildWindow>& rChild) { m_xChild = rChild; } diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index c00bf99df1cb..161e21e5c3fe 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -46,7 +46,7 @@ namespace dbaui @param _pChild The child window. */ - void setChildWindow(std::shared_ptr<OChildWindow>& rChild); + void setChildWindow(const std::shared_ptr<OChildWindow>& rChild); /** gets the child window. diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 59ba64f0b0ea..5873bc712404 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -237,7 +237,7 @@ void OApplicationView::paste() pTest->paste(); } -OUString OApplicationView::getQualifiedName(weld::TreeIter* _pEntry) const +OUString OApplicationView::getQualifiedName(const weld::TreeIter* _pEntry) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getQualifiedName( _pEntry ); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 4cc68c04ef4a..b3a5706c54b5 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -134,7 +134,7 @@ namespace dbaui @return the qualified name */ - OUString getQualifiedName(weld::TreeIter* _pEntry) const; + OUString getQualifiedName(const weld::TreeIter* _pEntry) const; /** returns if an entry is a leaf @param rTreeView diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 6e5b73e06db5..d98f9dedadc2 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -111,7 +111,7 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType(const weld::T return etQueryContainer; } -void SbaTableQueryBrowser::select(weld::TreeIter* pEntry, bool bSelect) +void SbaTableQueryBrowser::select(const weld::TreeIter* pEntry, bool bSelect) { if (pEntry) { @@ -124,7 +124,7 @@ void SbaTableQueryBrowser::select(weld::TreeIter* pEntry, bool bSelect) } } -void SbaTableQueryBrowser::selectPath(weld::TreeIter* pEntry, bool bSelect) +void SbaTableQueryBrowser::selectPath(const weld::TreeIter* pEntry, bool bSelect) { if (!pEntry) return; diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 597719f66618..7d51a5abf8fb 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -199,7 +199,7 @@ namespace dbaui return ( eType == etTableOrView || eType == etQuery ); } - void SbaTableQueryBrowser::copyEntry(weld::TreeIter& rEntry) + void SbaTableQueryBrowser::copyEntry(const weld::TreeIter& rEntry) { EntryType eType = getEntryType(rEntry); rtl::Reference<ODataClipboard> xTransfer(new ODataClipboard); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 26a8583230f3..2a6cbf9136b5 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2488,7 +2488,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implGetConnectionEntry(wel return xCurrentEntry; } -bool SbaTableQueryBrowser::implSelect(weld::TreeIter* pEntry) +bool SbaTableQueryBrowser::implSelect(const weld::TreeIter* pEntry) { if ( !pEntry ) return false; @@ -2957,7 +2957,7 @@ void SbaTableQueryBrowser::impl_releaseConnection( SharedConnection& _rxConnecti // will implicitly dispose if we have the ownership, since xConnection is a SharedConnection } -void SbaTableQueryBrowser::disposeConnection(weld::TreeIter* pDSEntry) +void SbaTableQueryBrowser::disposeConnection(const weld::TreeIter* pDSEntry) { OSL_ENSURE( pDSEntry, "SbaTableQueryBrowser::disposeConnection: invalid entry (NULL)!" ); OSL_ENSURE( impl_isDataSourceEntry( pDSEntry ), "SbaTableQueryBrowser::disposeConnection: invalid entry (not top-level)!" ); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index b39f6e65319e..415cc97d5fd7 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -279,7 +279,7 @@ bool OTableTreeListBox::isWildcardChecked(const weld::TreeIter& rEntry) return m_xTreeView->get_text_emphasis(rEntry, 0); } -void OTableTreeListBox::checkWildcard(weld::TreeIter& rEntry) +void OTableTreeListBox::checkWildcard(const weld::TreeIter& rEntry) { if (!m_bShowToggles) return; diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index ca78c1a67985..6307234e89de 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -385,7 +385,7 @@ namespace dbaui void clearDestColumns(); css::uno::Reference< css::beans::XPropertySet > returnTable(); - css::uno::Reference< css::beans::XPropertySet > getTable(); + css::uno::Reference< css::beans::XPropertySet > getTable() const; css::uno::Reference< css::beans::XPropertySet > createTable(); css::uno::Reference< css::beans::XPropertySet > createView() const; sal_Int32 getMaxColumnNameLength() const; diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 482800968dae..941ba2a1a80c 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -93,7 +93,7 @@ public: from checking the entry itself. The second is called 'wildcard' checking, 'cause in the resulting table filter it's represented by a wildcard.</p> */ - void checkWildcard(weld::TreeIter& rEntry); + void checkWildcard(const weld::TreeIter& rEntry); /** determine if the given entry is 'wildcard checked' @see checkWildcard diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index ed035d068f3f..e147b44b9e02 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -236,9 +236,9 @@ namespace dbaui // returns <TRUE/> if the entry is selected (which means it's part of the selected path) bool isSelected(const weld::TreeIter& rEntry) const; // select the entry (and only the entry, not the whole path) - void select(weld::TreeIter* pEntry, bool bSelect); + void select(const weld::TreeIter* pEntry, bool bSelect); // select the path of the entry (which must be an entry without children) - void selectPath(weld::TreeIter* pEntry, bool bSelect = true); + void selectPath(const weld::TreeIter* pEntry, bool bSelect = true); virtual void loadMenu(const css::uno::Reference< css::frame::XFrame >& _xFrame) override; @@ -282,7 +282,7 @@ namespace dbaui void unloadAndCleanup( bool _bDisposeConnection = true ); // disposes the connection associated with the given entry (which must represent a data source) - void disposeConnection(weld::TreeIter* xpDSEntry); + void disposeConnection(const weld::TreeIter* xpDSEntry); /// flushes and disposes the given connection, and de-registers as listener void impl_releaseConnection( SharedConnection& _rxConnection ); @@ -337,7 +337,7 @@ namespace dbaui void implRemoveStatusListeners(); bool implSelect(const svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect = false); - bool implSelect(weld::TreeIter* pEntry); + bool implSelect(const weld::TreeIter* pEntry); /// selects the entry given and loads the grid control with the object's data bool implSelect( @@ -417,7 +417,7 @@ namespace dbaui bool isEntryCopyAllowed(const weld::TreeIter& rEntry) const; - void copyEntry(weld::TreeIter& rEntry); + void copyEntry(const weld::TreeIter& rEntry); // remove all grid columns and dispose them static void clearGridColumns(const css::uno::Reference< css::container::XNameContainer >& _xColContainer); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index f395a59d2ba9..373a17907952 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1143,7 +1143,7 @@ Reference< XPropertySet > OCopyTableWizard::returnTable() return createTable(); } -Reference< XPropertySet > OCopyTableWizard::getTable() +Reference< XPropertySet > OCopyTableWizard::getTable() const { Reference< XPropertySet > xTable; diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 7bb6a3d13a37..118b3c79deec 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -160,7 +160,7 @@ public: bool IsEyedropping() const; - void onSelect( MaskSet* pSet ); + void onSelect( const MaskSet* pSet ); private: diff --git a/include/svx/signaturelinehelper.hxx b/include/svx/signaturelinehelper.hxx index b4a34749d101..b31e4c2e8483 100644 --- a/include/svx/signaturelinehelper.hxx +++ b/include/svx/signaturelinehelper.hxx @@ -57,7 +57,7 @@ SVX_DLLPUBLIC css::uno::Reference<css::graphic::XGraphic> importSVG(const OUStri * Sets xCertificate as the signing certificate of the selected shape on pView. */ SVX_DLLPUBLIC void -setShapeCertificate(SdrView* pView, +setShapeCertificate(const SdrView* pView, const css::uno::Reference<css::security::XCertificate>& xCertificate); } diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index aaf16fba2670..17e9ad2b15f9 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -147,7 +147,7 @@ private: SVX_DLLPRIVATE void ImpSetPointsRects() const; void UndirtyMrkPnt() const; - void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, SfxViewShell* pOtherShell); + void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const SfxViewShell* pOtherShell); protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 25fa10ed0635..1bd6dd9f7df9 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -149,7 +149,7 @@ public: void addTo( const ShapePtr & pShape ); css::uno::Sequence<css::beans::PropertyValue> getDomsAsPropertyValues() const; - ShapePtr getShape() { return mpShape; } + ShapePtr getShape() const { return mpShape; } private: ShapePtr mpShape; diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx index fac1f9a0af36..391639cd3df8 100644 --- a/svx/inc/tbxcolorupdate.hxx +++ b/svx/inc/tbxcolorupdate.hxx @@ -59,7 +59,7 @@ namespace svx void Update( const NamedColor& rNamedColor ); void Update( const Color& rColor, bool bForceUpdate = false ); Color const & GetCurrentColor() const { return maCurColor; } - OUString GetCurrentColorName(); + OUString GetCurrentColorName() const; private: ToolboxButtonColorUpdaterBase(ToolboxButtonColorUpdaterBase const &) = delete; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 79bdce07e800..c31e10543f37 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -483,7 +483,7 @@ void SvxBmpMask::dispose() } /** is called by a MaskSet when it is selected */ -void SvxBmpMask::onSelect( MaskSet* pSet ) +void SvxBmpMask::onSelect( const MaskSet* pSet ) { // now deselect all other value sets if( pSet != m_xQSet1.get() ) diff --git a/svx/source/dialog/signaturelinehelper.cxx b/svx/source/dialog/signaturelinehelper.cxx index 91de79aa9478..8890e142f35d 100644 --- a/svx/source/dialog/signaturelinehelper.cxx +++ b/svx/source/dialog/signaturelinehelper.cxx @@ -124,7 +124,7 @@ uno::Reference<graphic::XGraphic> importSVG(const OUString& rSVG) return xGraphic; } -void setShapeCertificate(SdrView* pView, +void setShapeCertificate(const SdrView* pView, const css::uno::Reference<css::security::XCertificate>& xCertificate) { const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 5b24bbc85e72..37927fed7431 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -302,7 +302,7 @@ namespace svxform m_xItemList->enable_drag_source(xTransferable, DND_ACTION_COPY); } - void XFormsPage::AddChildren(weld::TreeIter* _pParent, + void XFormsPage::AddChildren(const weld::TreeIter* _pParent, const Reference< css::xml::dom::XNode >& _xNode) { DBG_ASSERT( m_xUIHelper.is(), "XFormsPage::AddChildren(): invalid UIHelper" ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9cb6051ee7a0..7e9e53c62d7f 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1212,7 +1212,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) namespace { - FmFilterItems* getTargetItems(weld::TreeView& rTreeView, weld::TreeIter& rTarget) + FmFilterItems* getTargetItems(const weld::TreeView& rTreeView, const weld::TreeIter& rTarget) { FmFilterData* pData = reinterpret_cast<FmFilterData*>(rTreeView.get_id(rTarget).toUInt64()); FmFilterItems* pTargetItems = dynamic_cast<FmFilterItems*>(pData); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index e42e414be757..2d1700f65f4e 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -81,7 +81,7 @@ using ::com::sun::star::awt::XWindow; SFX_IMPL_MODELESSDIALOGCONTOLLER(FmPropBrwMgr, SID_FM_SHOW_PROPERTIES) FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId, - SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) + SfxBindings* _pBindings, const SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) { std::shared_ptr<FmPropBrw> xControl(new FmPropBrw(::comphelper::getProcessComponentContext(), _pBindings, diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index c512c445d950..fe875b9e5cfc 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -163,7 +163,7 @@ namespace svxform } } - size_t OControlTransferData::onEntryRemoved(weld::TreeView* pView, weld::TreeIter* _pEntry) + size_t OControlTransferData::onEntryRemoved(const weld::TreeView* pView, const weld::TreeIter* _pEntry) { auto aIter = std::find_if(m_aSelectedEntries.begin(), m_aSelectedEntries.end(), [pView, _pEntry](const auto& rElem) { @@ -226,7 +226,7 @@ namespace svxform } } - void OControlTransferData::buildListFromPath(const weld::TreeView* pTreeBox, weld::TreeIter* pRoot) + void OControlTransferData::buildListFromPath(const weld::TreeView* pTreeBox, const weld::TreeIter* pRoot) { ListBoxEntrySet aEmpty; m_aSelectedEntries.swap( aEmpty ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index de01cc9763a6..ef4bc95a68a3 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -716,7 +716,7 @@ namespace svxform return nAction == implAcceptDataTransfer(aClipboardContent.GetDataFlavorExVector(), nAction, xSelected.get(), false); } - sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, weld::TreeIter* _pTargetEntry, bool _bDnD ) + sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const weld::TreeIter* _pTargetEntry, bool _bDnD ) { // no target -> no drop if (!_pTargetEntry) @@ -872,7 +872,7 @@ namespace svxform return implExecuteDataTransfer( _rData, _nAction, xDrop.get(), _bDnD ); } - sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, weld::TreeIter* _pTargetEntry, bool _bDnD ) + sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const weld::TreeIter* _pTargetEntry, bool _bDnD ) { const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector(); @@ -1188,7 +1188,7 @@ namespace svxform } } - void NavigatorTree::ModelHasRemoved(weld::TreeIter* pTypedEntry) + void NavigatorTree::ModelHasRemoved(const weld::TreeIter* pTypedEntry) { if (doingKeyboardCut()) { diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx index 26ba93d7be79..2b930672d23f 100644 --- a/svx/source/inc/StylesPreviewWindow.hxx +++ b/svx/source/inc/StylesPreviewWindow.hxx @@ -33,8 +33,9 @@ class StyleStatusListener : public SfxStatusListener StylesPreviewWindow_Base* m_pPreviewControl; public: - StyleStatusListener(StylesPreviewWindow_Base* pPreviewControl, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); + StyleStatusListener( + StylesPreviewWindow_Base* pPreviewControl, + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); void StateChanged(SfxItemState eState, const SfxPoolItem* pState) override; }; @@ -49,8 +50,9 @@ class StyleItemController : public weld::CustomWidgetController css::uno::Reference<css::frame::XDispatchProvider> m_xDispatchProvider; public: - StyleItemController(const std::pair<OUString, OUString>& aStyleName, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); + StyleItemController( + const std::pair<OUString, OUString>& aStyleName, + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; @@ -66,7 +68,7 @@ private: void DrawHighlight(vcl::RenderContext& rRenderContext, Color aFontBack); static void DrawSelection(vcl::RenderContext& rRenderContext); static void DrawContentBackground(vcl::RenderContext& rRenderContext, - tools::Rectangle& aContentRect, Color& aColor); + const tools::Rectangle& aContentRect, const Color& aColor); }; class StylesPreviewWindow_Base @@ -93,9 +95,9 @@ protected: DECL_LINK(GoDown, const OString&, void); public: - StylesPreviewWindow_Base(weld::Builder& xBuilder, - std::vector<std::pair<OUString, OUString>>& aDefaultStyles, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); + StylesPreviewWindow_Base( + weld::Builder& xBuilder, std::vector<std::pair<OUString, OUString>>& aDefaultStyles, + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); ~StylesPreviewWindow_Base(); void Select(const OUString& rStyleName); @@ -110,9 +112,9 @@ private: class StylesPreviewWindow_Impl : public InterimItemWindow, public StylesPreviewWindow_Base { public: - StylesPreviewWindow_Impl(vcl::Window* pParent, - std::vector<std::pair<OUString, OUString>>& aDefaultStyles, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); + StylesPreviewWindow_Impl( + vcl::Window* pParent, std::vector<std::pair<OUString, OUString>>& aDefaultStyles, + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); ~StylesPreviewWindow_Impl(); void dispose(); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 652ce21fa876..30f140f2aad1 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -207,7 +207,7 @@ namespace svxform DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(PopupMenuHdl, const CommandEvent&, bool); - void AddChildren(weld::TreeIter* _pParent, + void AddChildren(const weld::TreeIter* _pParent, const css::uno::Reference< css::xml::dom::XNode >& _xNode); bool DoToolBoxAction(const OString& rToolBoxID); void AddEntry(std::unique_ptr<ItemNode> _pNewNode, bool _bIsElement, weld::TreeIter* pRet = nullptr); diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 4fb36fc595ce..86408e46fd5a 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -32,7 +32,7 @@ class FmPropBrwMgr : public SfxChildWindow { public: - FmPropBrwMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); + FmPropBrwMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, const SfxChildWinInfo *pInfo); SFX_DECL_CHILDWINDOW(FmPropBrwMgr); }; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index deed78fc5d6c..039a185e2a1b 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -154,7 +154,7 @@ namespace svxform @param _pEntry @return the number of entries remaining in the selection. */ - size_t onEntryRemoved(weld::TreeView* pView, weld::TreeIter* _pEntry); + size_t onEntryRemoved(const weld::TreeView* pView, const weld::TreeIter* _pEntry); void setFormsRoot( const css::uno::Reference< css::form::XForms >& _rxFormsRoot @@ -165,7 +165,7 @@ namespace svxform // (it is assumed that the entries are sorted in m_aSelectedEntries with respect to the neighbor relationship) - void buildListFromPath(const weld::TreeView* pTreeBox, weld::TreeIter* pRoot); + void buildListFromPath(const weld::TreeView* pTreeBox, const weld::TreeIter* pRoot); // The reverse way: throws everything out of m_aSelectedEntries and rebuilds it using m_aControlPaths void addHiddenControlsFormat(const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& seqInterfaces); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 50e16fdccc0f..8f0d99f5676a 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -493,10 +493,10 @@ namespace svxform sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt); private: - sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, weld::TreeIter* _pTargetEntry, bool _bDnD ); + sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const weld::TreeIter* _pTargetEntry, bool _bDnD ); sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD ); - sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, weld::TreeIter* _pTargetEntry, bool _bDnD ); + sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const weld::TreeIter* _pTargetEntry, bool _bDnD ); // check if a cut, copy, or drag operation can be started in the current situation bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = nullptr ); @@ -506,7 +506,7 @@ namespace svxform // fills m_aControlExchange in preparation of a DnD or clipboard operation bool implPrepareExchange( sal_Int8 _nAction ); - void ModelHasRemoved(weld::TreeIter* _pEntry); + void ModelHasRemoved(const weld::TreeIter* _pEntry); void doPaste(); void doCopy(); diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx index 6c99bec7f324..d9f397a07470 100644 --- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx +++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx @@ -106,7 +106,7 @@ static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, O } static void FillBox_Impl(weld::TreeView& rListBoxStyles, const TreeNode& rCurrent, - weld::TreeIter* pParent) + const weld::TreeIter* pParent) { std::unique_ptr<weld::TreeIter> pResult = rListBoxStyles.make_iterator(); const OUString& rName = rCurrent.sNodeName; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 1038be5c5351..35836d47cf73 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -61,7 +61,7 @@ public: namespace { - SvxLineStyleToolBoxControl* getLineStyleToolBoxControl(ToolbarUnoDispatcher& rToolBoxColor) + SvxLineStyleToolBoxControl* getLineStyleToolBoxControl(const ToolbarUnoDispatcher& rToolBoxColor) { css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxColor.GetControllerForCommand(".uno:XLineStyle"); SvxLineStyleToolBoxControl* pToolBoxLineStyleControl = dynamic_cast<SvxLineStyleToolBoxControl*>(xController.get()); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 2ef9c7a3fe30..c3e6bd81f42a 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -681,7 +681,7 @@ OUString lcl_getDragParameterString( const OUString& rCID ) } } // anonymous namespace -void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, SfxViewShell* pOtherShell) +void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const SfxViewShell* pOtherShell) { SfxViewShell* pViewShell = GetSfxViewShell(); diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index a36cd5203263..7448592f2162 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -56,7 +56,7 @@ StyleStatusListener::StyleStatusListener( StylesPreviewWindow_Base* pPreviewControl, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) : SfxStatusListener(xDispatchProvider, SID_STYLE_FAMILY2, ".uno:ParaStyle") , m_pPreviewControl(pPreviewControl) { @@ -72,7 +72,7 @@ void StyleStatusListener::StateChanged(SfxItemState /*eState*/, const SfxPoolIte StyleItemController::StyleItemController( const std::pair<OUString, OUString>& aStyleName, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) : m_eStyleFamily(SfxStyleFamily::Para) , m_aStyleName(aStyleName) , m_bSelected(false) @@ -297,7 +297,8 @@ void StyleItemController::DrawEntry(vcl::RenderContext& rRenderContext) } void StyleItemController::DrawContentBackground(vcl::RenderContext& rRenderContext, - tools::Rectangle& aContentRect, Color& aColor) + const tools::Rectangle& aContentRect, + const Color& aColor) { rRenderContext.SetLineColor(aColor); rRenderContext.SetFillColor(aColor); @@ -351,7 +352,7 @@ void StyleItemController::DrawText(vcl::RenderContext& rRenderContext) StylesPreviewWindow_Base::StylesPreviewWindow_Base( weld::Builder& xBuilder, std::vector<std::pair<OUString, OUString>>& aDefaultStyles, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) : m_xUp(xBuilder.weld_toolbar("uptoolbar")) , m_xDown(xBuilder.weld_toolbar("downtoolbar")) , m_aDefaultStyles(aDefaultStyles) @@ -489,7 +490,7 @@ IMPL_LINK(StylesPreviewWindow_Base, GoDown, const OString&, /*rItem*/, void) StylesPreviewWindow_Impl::StylesPreviewWindow_Impl( vcl::Window* pParent, std::vector<std::pair<OUString, OUString>>& aDefaultStyles, - css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) + const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) : InterimItemWindow(pParent, "svx/ui/stylespreview.ui", "ApplyStyleBox", reinterpret_cast<sal_uInt64>(SfxViewShell::Current())) , StylesPreviewWindow_Base(*m_xBuilder, aDefaultStyles, xDispatchProvider) diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 9d400ff3046d..6bf96c7da461 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -217,7 +217,7 @@ namespace svx SetImage(pVirDev.get()); } - OUString ToolboxButtonColorUpdaterBase::GetCurrentColorName() + OUString ToolboxButtonColorUpdaterBase::GetCurrentColorName() const { OUString sColorName = GetQuickHelpText(); // The obtained string is of format: color context (color name) diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx index f9bb5342c626..3942163e970c 100644 --- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx +++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx @@ -117,7 +117,7 @@ void GetSignatureLineShape(const uno::Reference<frame::XModel>& xModel, sal_Int3 } /// Turns an array of floats into offset + length pairs. -bool GetByteRangesFromPDF(vcl::filter::PDFArrayElement& rArray, +bool GetByteRangesFromPDF(const vcl::filter::PDFArrayElement& rArray, std::vector<std::pair<size_t, size_t>>& rByteRanges) { size_t nByteRangeOffset = 0; |