diff options
137 files changed, 370 insertions, 371 deletions
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx index 15936c9e593d..9f43e90fdc02 100644 --- a/compilerplugins/clang/constparams.cxx +++ b/compilerplugins/clang/constparams.cxx @@ -111,6 +111,9 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl * functionDecl) || name == "my_if_errors" || name == "my_eval_defined" || name == "my_eval_variable" + || name == "ImpGetEscDir" + || name == "ImpGetPercent" + || name == "ImpGetAlign" // #ifdef win32 || name == "convert_slashes" // UNO component entry points @@ -268,9 +271,10 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar if (operatorCallExpr->getArg(0) == stmt) { return calleeMethodDecl->isConst(); } - if (operatorCallExpr->getArg(1) == stmt) { - return isPointerOrReferenceToConst(calleeMethodDecl->getParamDecl(0)->getType()); - } + for (unsigned i = 1; i < operatorCallExpr->getNumArgs(); ++i) + if (operatorCallExpr->getArg(i) == stmt) { + return isPointerOrReferenceToConst(calleeMethodDecl->getParamDecl(i - 1)->getType()); + } } else { const Expr* callee = operatorCallExpr->getCallee()->IgnoreParenImpCasts(); const DeclRefExpr* dr = dyn_cast<DeclRefExpr>(callee); diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 2d1ada85d863..7023fd6467f3 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -177,7 +177,7 @@ public: @param rShapeTreeInfo The new info that replaces the current one. */ - void SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo); + void SetInfo (AccessibleShapeTreeInfo const & rShapeTreeInfo); /** Update the SELECTED and FOCUSED states of all visible children according to the given selection. This includes setting diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 520a560880d1..3f826fa217e4 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -74,7 +74,7 @@ private: DECL_LINK( OpenPickerClickHdl, Button*, void ); static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor); - static NamedColor GetSelectEntryColor(ValueSet* pColorSet); + static NamedColor GetSelectEntryColor(ValueSet const * pColorSet); NamedColor GetAutoColor() const; public: diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index fd96b1ce247a..4fbbacde7361 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -304,7 +304,7 @@ protected: void InitSettings(bool bForeground, bool bBackground); // prepare buffered paint - void LocalPrePaint(vcl::RenderContext& rRenderContext); + void LocalPrePaint(vcl::RenderContext const & rRenderContext); // end and output buffered paint void LocalPostPaint(vcl::RenderContext& rRenderContext); diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx index d884674db66e..2c2d9d9e1b9e 100644 --- a/include/svx/extrud3d.hxx +++ b/include/svx/extrud3d.hxx @@ -41,7 +41,7 @@ private: protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; - void SetDefaultAttributes(E3dDefaultAttributes& rDefault); + void SetDefaultAttributes(E3dDefaultAttributes const & rDefault); public: diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx index 4aa902bf4fe2..5d8f515eb9a9 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -33,7 +33,7 @@ class SdrView; namespace svx { -SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ); +SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded ); class SAL_WARN_UNUSED SVX_DLLPUBLIC ExtrusionBar : public SfxShell { @@ -48,8 +48,8 @@ public: ExtrusionBar(SfxViewShell* pViewShell); virtual ~ExtrusionBar() override; - static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); - static void getState( SdrView* pSdrView, SfxItemSet& rSet ); + static void execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings ); + static void getState( SdrView const * pSdrView, SfxItemSet& rSet ); }; } diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 0064d80da21e..b79255a67b5d 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -220,7 +220,7 @@ public: void InitColorLB(); bool IsUpdateMode() const { return bUpdate; } - void Update( SfxItemSet& rSet ); + void Update( SfxItemSet const & rSet ); void GetAttr( SfxItemSet& rSet ); void UpdatePreview(); // upward (private) diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index a47ef033d7a9..f82899aca673 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -191,7 +191,7 @@ protected: @return <TRUE/> if the column is selected, otherwise <FALSE/> */ - bool isColumnSelected(DbGridColumn* _pColumn); + bool isColumnSelected(DbGridColumn const * _pColumn); }; #endif // INCLUDED_SVX_FMGRIDCL_HXX diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index f74fd79daad4..0982c0dd38f1 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -473,8 +473,8 @@ public: virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override; virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override; - void columnVisible(DbGridColumn* pColumn); - void columnHidden(DbGridColumn* pColumn); + void columnVisible(DbGridColumn const * pColumn); + void columnHidden(DbGridColumn const * pColumn); // css::awt::XView virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) override; diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 9d0771f0d01e..808d814452b1 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -71,7 +71,7 @@ public: void SetName( const OUString& rName ) { m_sPageName = rName; } static bool RequestHelp( vcl::Window* pWin, - SdrView* pView, + SdrView const * pView, const HelpEvent& rEvt ); protected: diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 6de1f3b3668d..92ca8585e2ef 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -86,7 +86,7 @@ public: virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) override; static void createControlLabelPair( - OutputDevice* _pOutDev, + OutputDevice const * _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const css::uno::Reference< css::beans::XPropertySet >& _rxField, @@ -122,8 +122,8 @@ public: /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); - SVX_DLLPRIVATE void ActivateControls(SdrPageView*); - SVX_DLLPRIVATE void DeactivateControls(SdrPageView*); + SVX_DLLPRIVATE void ActivateControls(SdrPageView const *); + SVX_DLLPRIVATE void DeactivateControls(SdrPageView const *); SVX_DLLPRIVATE void ChangeDesignMode(bool bDesign); diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index e2a38a6f0fb5..c9f0b78bb17a 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -33,7 +33,7 @@ class SdrView; namespace svx { -bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ); +bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus ); class SAL_WARN_UNUSED SVX_DLLPUBLIC FontworkBar : public SfxShell { @@ -48,8 +48,8 @@ public: FontworkBar(SfxViewShell* pViewShell); virtual ~FontworkBar() override; - static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); - static void getState( SdrView* pSdrView, SfxItemSet& rSet ); + static void execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings ); + static void getState( SdrView const * pSdrView, SfxItemSet& rSet ); }; } diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 1f8755742a88..ada646b08a02 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -107,7 +107,7 @@ private: GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName ); SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); - SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme* pTheme ); + SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme const * pTheme ); Gallery( const OUString& rMultiPath ); virtual ~Gallery() override; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 2b6b15ce9236..ecdaea3a45ea 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -189,7 +189,7 @@ public: bool GetModel( sal_uIntPtr nPos, SdrModel& rModel ); bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos ); - SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rModelStreamRef ); + SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream> const & rModelStreamRef ); SAL_DLLPRIVATE bool InsertModelStream( const tools::SvRef<SotStorageStream>& rModelStream, sal_uIntPtr nInsertPos ); SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL ); diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index f50df7df77b3..f2169ba9007c 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -114,7 +114,7 @@ class SVX_DLLPUBLIC SvxGrafAttrHelper public: static void ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ); - static void GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ); + static void GetGrafAttrState( SfxItemSet& rSet, SdrView const & rView ); }; #endif // INCLUDED_SVX_GRAFCTRL_HXX diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx index 278e093e24bc..fc60cd256a05 100644 --- a/include/svx/grfflt.hxx +++ b/include/svx/grfflt.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter { public: - static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); + static sal_uLong ExecuteGrfFilterSlot( SfxRequest const & rReq, GraphicObject& rFilterObject ); static void DisableGraphicFilterSlots( SfxItemSet& rSet ); }; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 5889af9bff89..319b5d97c896 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -560,7 +560,7 @@ protected: sal_Int32 AlignSeekCursor(); bool SetCurrent(long nNewRow); - OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const; + OUString GetCurrentRowCellText(DbGridColumn const * pCol,const DbGridRowRef& _rRow) const; virtual void DeleteSelectedRows(); static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.is() && _xRow->IsValid(); } diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index 39c28f6b6e45..d2dc16a76c54 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -41,7 +41,7 @@ private: protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; - void SetDefaultAttributes(E3dDefaultAttributes& rDefault); + void SetDefaultAttributes(E3dDefaultAttributes const & rDefault); public: E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D); diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index eaba4507685e..299ed15a0e6b 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -83,13 +83,13 @@ public: void SetNumberingSettings( const css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> >& aNum, - css::uno::Reference<css::text::XNumberingFormatter>& xFormatter, + css::uno::Reference<css::text::XNumberingFormatter> const & xFormatter, const css::lang::Locale& rLocale ); void SetOutlineNumberingSettings( css::uno::Sequence< - css::uno::Reference<css::container::XIndexAccess> >& rOutline, - css::uno::Reference<css::text::XNumberingFormatter>& xFormatter, + css::uno::Reference<css::container::XIndexAccess> > const & rOutline, + css::uno::Reference<css::text::XNumberingFormatter> const & xFormatter, const css::lang::Locale& rLocale); }; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 22a3f9e5db8e..bb3ee1a50a67 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -160,7 +160,7 @@ public: // Insert 3D object into the group; transfer to other owner! void Insert3DObj(E3dObject* p3DObj); - void Remove3DObj(E3dObject* p3DObj); + void Remove3DObj(E3dObject const * p3DObj); E3dObject* GetParentObj() const; virtual E3dScene* GetScene() const; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index f3afb3f35868..d509c18b62d8 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -72,8 +72,8 @@ public: : Edit(pParent, WB_BORDER) { } - void SetScrollHdl(Link<sal_Int32,bool>& rLink) {aScrollHdl = rLink;} - void SetJumpHdl(Link<sal_Int32,void>& rLink) {aJumpHdl = rLink;} + void SetScrollHdl(Link<sal_Int32,bool> const & rLink) {aScrollHdl = rLink;} + void SetJumpHdl(Link<sal_Int32,void> const & rLink) {aJumpHdl = rLink;} }; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index d08f5abc0ceb..5b9dd171710c 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -69,7 +69,7 @@ public: SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr ); SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId ); SVX_DLLPRIVATE void onSelect( sal_uInt16 nSId ); - SVX_DLLPRIVATE void onFormatTable( SfxRequest& rReq ); + SVX_DLLPRIVATE void onFormatTable( SfxRequest const & rReq ); SVX_DLLPRIVATE void MergeMarkedCells(); SVX_DLLPRIVATE void SplitMarkedCells(); SVX_DLLPRIVATE void DistributeColumns(); @@ -135,7 +135,7 @@ private: SVX_DLLPRIVATE void SetTableStyle( const SfxItemSet* pArgs ); SVX_DLLPRIVATE void SetTableStyleSettings( const SfxItemSet* pArgs ); - SVX_DLLPRIVATE bool PasteObject( SdrTableObj* pPasteTableObj ); + SVX_DLLPRIVATE bool PasteObject( SdrTableObj const * pPasteTableObj ); SVX_DLLPRIVATE bool checkTableObject(); SVX_DLLPRIVATE const CellPos& getSelectionStart(); diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 970fdd7efc62..691837b2a5d5 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -41,7 +41,7 @@ namespace sdr /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) void SVX_DLLPUBLIC -PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect); +PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect); class SdrPreRenderDevice { diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 833d6d8bb9f5..5f23aa4b06ed 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -46,7 +46,7 @@ private: VclPtr<MetricField> maMtrTrgrEndValue; VclPtr<MetricField> maMtrTrgrBorder; - void InitStatus(XFillFloatTransparenceItem* pGradientItem); + void InitStatus(XFillFloatTransparenceItem const * pGradientItem); void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol); DECL_LINK(ModifiedTrgrHdl_Impl, Edit&, void); DECL_LINK(Left_Click45_Impl, ToolBox*, void); @@ -54,7 +54,7 @@ private: public: AreaTransparencyGradientPopup(AreaPropertyPanelBase& rPanel); virtual ~AreaTransparencyGradientPopup() override; - void Rearrange (XFillFloatTransparenceItem* pItem); + void Rearrange (XFillFloatTransparenceItem const * pItem); virtual void dispose() override; }; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 8042aaffe190..d1f46e013553 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -246,7 +246,7 @@ private: DECL_LINK(NoFormatHdl_Impl, Button*, void); DECL_LINK(AttributeHdl_Impl, Button*, void); DECL_LINK( TimeoutHdl_Impl, Timer*, void ); - void ClickHdl_Impl(void* pCtrl); + void ClickHdl_Impl(void const * pCtrl); void Construct_Impl(); void InitControls_Impl(); @@ -260,7 +260,7 @@ private: void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ); void EnableControls_Impl( const SearchOptionFlags nFlags ); - void EnableControl_Impl( Control* pCtrl ); + void EnableControl_Impl( Control const * pCtrl ); void SetItem_Impl( const SvxSearchItem* pItem ); void SetModifyFlag_Impl( const Control* pCtrl ); diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 039f56cae89b..ce94834724d6 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -149,7 +149,7 @@ protected: static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bRotate, const tools::Rectangle& rMarkRect); static void ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); - bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; + bool ImpDelLayerCheck(SdrObjList const * pOL, SdrLayerID nDelID) const; void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); // Removes all objects of the MarkList from their ObjLists including Undo. diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 58956b9d143c..8dd62ff0b3ec 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -106,13 +106,13 @@ protected: TextChainCursorManager *ImpHandleMotionThroughBoxesKeyInput(const KeyEvent& rKEvt, bool *bOutHandled); - OutlinerView* ImpFindOutlinerView(vcl::Window* pWin) const; + OutlinerView* ImpFindOutlinerView(vcl::Window const * pWin) const; // Create a new OutlinerView at the heap and initialize all required parameters. // pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const; void ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect, OutputDevice& rTargetDevice) const; - void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; + void ImpInvalidateOutlinerView(OutlinerView const & rOutlView) const; // Chaining void ImpChainingEventHdl(); @@ -273,7 +273,7 @@ public: void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); /** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */ - static void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ); + static void ApplyFormatPaintBrushToText( SfxItemSet const & rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ); protected: virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ); diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index f8c74d23a81c..0c438930bb45 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -217,8 +217,8 @@ public: } // pPage=0L: Selection of everything! Respect Pages - bool TakeBoundRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; - bool TakeSnapRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; + bool TakeBoundRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; + bool TakeSnapRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; // All Entries are copied! SdrMarkList& operator=(const SdrMarkList& rLst); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index b9210f5d072d..79ce5d78085c 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -266,7 +266,7 @@ public: css::uno::Reference< css::io::XInputStream > GetDocumentStream(OUString const& rURL, - ::comphelper::LifecycleProxy & rProxy) const; + ::comphelper::LifecycleProxy const & rProxy) const; // Change the template attributes of the symbol objects to hard attributes void BurnInStyleSheetAttributes(); // If you inherit from SdrPage you also need to inherit from SdrModel diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index dd2bd2ea3b4c..96b9b2343814 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -153,8 +153,8 @@ protected: void ForceUndirtyMrkPnt() const { if (mbMrkPntDirty) UndirtyMrkPnt(); } virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay) const; - SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const; - SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; + SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const; + SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; bool ImpIsFrameHandles() const; void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const; @@ -180,7 +180,7 @@ public: virtual void ClearPageView() override; virtual void HideSdrPage() override; - bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + bool IsObjMarkable(SdrObject const * pObj, SdrPageView const * pPV) const; // Returns sal_True if objects, points or glue points are selected by drawing a frame // (as long as the frame is drawn). @@ -292,12 +292,11 @@ public: void MarkObj(const tools::Rectangle& rRect, bool bUnmark); void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages - void UnmarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages + void UnmarkAllObj(SdrPageView const * pPV=nullptr); // pPage=NULL => all displayed pages // This function is time-consuming intensive, as the MarkList has to be scanned. - bool IsObjMarked(SdrObject* pObj) const; - // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline - void UnMarkAll(SdrPageView* pPV=nullptr) { UnmarkAllObj(pPV); } + bool IsObjMarked(SdrObject const * pObj) const; + void UnMarkAll(SdrPageView const * pPV=nullptr) { UnmarkAllObj(pPV); } // Request/set the size of the marking handles. Declaration in Pixel. // The value is meant to be the edge length ( link length ). @@ -331,7 +330,7 @@ public: // Search for the number of the suitable handle. In case of empty search result, // SAL_MAX_SIZE is returned. - size_t GetHdlNum(SdrHdl* pHdl) const { return maHdlList.GetHdlNum(pHdl); } + size_t GetHdlNum(SdrHdl const * pHdl) const { return maHdlList.GetHdlNum(pHdl); } SdrHdl* GetHdl(size_t nHdlNum) const { return maHdlList.GetHdl(nHdlNum); } const SdrHdlList& GetHdlList() const { return maHdlList; } diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index d1b0680010e9..3dd68293708a 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -66,10 +66,10 @@ private: private: SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const; - SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect); + SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect); + SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect); + SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect); SVX_DLLPRIVATE void ImpRecalcTail(); public: diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 670c7ff6894f..7246c9ff3134 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -180,7 +180,7 @@ protected: const Point& rPt2, long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr); - static SdrEscapeDirection ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2); + static SdrEscapeDirection ImpCalcEscAngle(SdrObject const * pObj, const Point& aPt2); void ImpSetTailPoint(bool bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // potential recalculation of the connection track void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 80fb05ed1b9a..34c31c4590ba 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -87,7 +87,7 @@ public: // The original size of the object (size of the icon for iconified object) // no conversion is done if no target mode is provided - Size GetOrigObjSize( MapMode* pTargetMapMode = nullptr ) const; + Size GetOrigObjSize( MapMode const * pTargetMapMode = nullptr ) const; // #i118524# Allow suppress SetVisAreaSize in changing methods when call // comes from OLE client diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 6be7578d7d86..0269c88e5d39 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -607,7 +607,7 @@ public: or if the given SdrOutliner contains no text. Also checks for one empty paragraph. */ - static bool HasTextImpl( SdrOutliner* pOutliner ); + static bool HasTextImpl( SdrOutliner const * pOutliner ); friend class ::SdrTextObjTest; }; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index a348c2c75e1f..696205e1ef6e 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -83,7 +83,7 @@ protected: private: /// simple ActionChildInserted forwarder to have it on a central place - static void impChildInserted(SdrObject& rChild); + static void impChildInserted(SdrObject const & rChild); public: SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage); virtual ~SdrObjList(); @@ -498,7 +498,7 @@ public: /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value - Color GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay = true) const; + Color GetPageBackgroundColor( SdrPageView const * pView, bool bScreenDisplay = true) const; /** this method returns true if the object from the ViewObjectContact should be visible on this page while rendering. diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index b068ecea8875..26b971f8496b 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -228,7 +228,7 @@ public: /// it must not be locked /// @returns /// true, if the object's layer is visible and not locked - bool IsObjMarkable(SdrObject* pObj) const; + bool IsObjMarkable(SdrObject const * pObj) const; /// Entering (editing) an object group /// After that, we have direct access to all member objects of the group. diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 76d0ca49662c..679333065372 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -75,7 +75,7 @@ class SVX_DLLPUBLIC SdrViewIter private: SVX_DLLPRIVATE void ImpInitVars(); SVX_DLLPRIVATE SdrView* ImpFindView(); - SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView* pPV) const; + SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView const * pPV) const; public: SdrViewIter(const SdrPage* pPage); diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index b3d58103efe3..f7738f3fc5c1 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -79,7 +79,7 @@ protected: void init(); /// @throws css::beans::UnknownPropertyException - static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, css::uno::Any& rValue ); + static void getAny( SfxItemPool const * pPool, const comphelper::PropertyMapEntry* pEntry, css::uno::Any& rValue ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 94a137c73ae8..7f6b618e8f25 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -146,7 +146,7 @@ protected: void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); - css::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; + css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const; bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); @@ -216,7 +216,7 @@ public: sal_uInt32 getShapeKind() const; // styles need this - static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); + static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel ); static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ); /** same as SetFillAttribute but for property names instead of which ids, diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 0a25eef18051..48ff9b6f12b2 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -53,13 +53,13 @@ protected: void InitView(); - void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); - void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); + void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat); + void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat); void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj); void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj); void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ); - void ImpIsConvertTo3DPossible(SdrObject* pObj, bool& rAny3D, bool& rGroupSelected) const; + void ImpIsConvertTo3DPossible(SdrObject const * pObj, bool& rAny3D, bool& rGroupSelected) const; void BreakSingle3DObj(E3dObject* pObj); public: @@ -87,13 +87,13 @@ public: const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) override; // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) - bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); + bool ImpCloneAll3DObjectsToDestScene(E3dScene const * pSrcScene, E3dScene* pDstScene, Point aOffset); bool IsConvertTo3DObjPossible() const; void ConvertMarkedObjTo3D(bool bExtrude=true, const basegfx::B2DPoint& rPnt1 = basegfx::B2DPoint(0.0, 0.0), const basegfx::B2DPoint& rPnt2 = basegfx::B2DPoint(0.0, 1.0)); // Means to create all Extrudes in a certain depth order. - static void DoDepthArrange(E3dScene* pScene, double fDepth); + static void DoDepthArrange(E3dScene const * pScene, double fDepth); void ConvertMarkedToPolyObj(); E3dScene* SetCurrent3DObj(E3dObject* p3DObj); void Start3DCreation(); diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index aa3bb25949f5..70128ebb87f6 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -78,7 +78,7 @@ private: const OUString& rPictureStreamName, const OUString& rGraphicId, bool bUseGfxLink ); - SVX_DLLPRIVATE void ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString& rRequestedFileName ); + SVX_DLLPRIVATE void ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString const & rRequestedFileName ); protected: SvXMLGraphicHelper(); diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index b179abc92811..2bf2ffe07473 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -132,7 +132,7 @@ void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) const SdrObject* pObj = pSdrHint->GetObject(); const SdrHintKind eKind = pSdrHint->GetKind(); // check for change of selected object - if(SdrHintKind::ObjectChange == eKind && pObj && IsObjMarked(const_cast<SdrObject*>(pObj))) + if(SdrHintKind::ObjectChange == eKind && pObj && IsObjMarked(pObj)) AdjustMarkHdl(); else if ( eKind == SdrHintKind::ObjectRemoved ) ObjectRemovedInAliveMode(pObj); diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx index 46f6e4d32988..4ea4ed8e82c3 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx @@ -48,7 +48,7 @@ namespace sdr void impPrepareGraphicWithAsynchroniousLoading(); void impPrepareGraphicWithSynchroniousLoading(); void doAsynchGraphicLoading(); - void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent* pEvent); + void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent const * pEvent); protected: const SdrGrafObj& getSdrGrafObj() const; diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 682333ad4401..76b855564c93 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -97,7 +97,7 @@ class SdrItemBrowser: public FloatingWindow { Idle aIdle; SdrView* pView; bool bDirty; - static vcl::Window* ImpGetViewWin(SdrView& rView); + static vcl::Window* ImpGetViewWin(SdrView const & rView); DECL_LINK(IdleHdl, Timer *, void); DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void); DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void); diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 972228117db5..31857d2ac29a 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -89,7 +89,7 @@ void ChildrenManager::ClearAccessibleShapeList() mpImpl->ClearAccessibleShapeList (); } -void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo) +void ChildrenManager::SetInfo (AccessibleShapeTreeInfo const & rShapeTreeInfo) { mpImpl->SetInfo (rShapeTreeInfo); } diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index a919f7c2c38e..a734d24c0c75 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -241,7 +241,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom return pRenderedShape; } -void SetTemporary( uno::Reference< drawing::XShape >& xShape ) +void SetTemporary( uno::Reference< drawing::XShape > const & xShape ) { if ( xShape.is() ) { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 74fe85448178..8786336dfb01 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1498,7 +1498,7 @@ void SvxPreviewBase::dispose() Control::dispose(); } -void SvxPreviewBase::LocalPrePaint(vcl::RenderContext& rRenderContext) +void SvxPreviewBase::LocalPrePaint(vcl::RenderContext const & rRenderContext) { // init BufferDevice if (mpBufferDevice->GetOutputSizePixel() != GetOutputSizePixel()) diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index bd5ff70a24ff..e5d9225450c8 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -84,7 +84,7 @@ using ::com::sun::star::i18n::BreakIterator; namespace { -void scaleFontWidth(vcl::Font& rFont, vcl::RenderContext& rRenderContext,long& n100PercentFont) +void scaleFontWidth(vcl::Font& rFont, vcl::RenderContext const & rRenderContext,long& n100PercentFont) { rFont.SetAverageFontWidth(0); n100PercentFont = rRenderContext.GetFontMetric(rFont).GetAverageFontWidth(); @@ -195,13 +195,13 @@ public: } void CheckScript(); - Size CalcTextSize(vcl::RenderContext& rRenderContext, OutputDevice* pPrinter, const SvxFont& rFont); + Size CalcTextSize(vcl::RenderContext& rRenderContext, OutputDevice const * pPrinter, const SvxFont& rFont); void DrawPrev(vcl::RenderContext& rRenderContext, Printer* pPrinter, Point& rPt, const SvxFont& rFont); bool SetFontWidthScale(sal_uInt16 nScaleInPercent); inline void Invalidate100PercentFontWidth(); inline bool Is100PercentFontWidthValid() const; - void ScaleFontWidth(vcl::RenderContext& rRenderContext); + void ScaleFontWidth(vcl::RenderContext const & rRenderContext); // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and // sets the 100%-Font-Widths }; @@ -288,7 +288,7 @@ void FontPrevWin_Impl::CheckScript() * The member nAscent is calculated to the maximal ascent of all used fonts. */ -Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDevice* _pPrinter, const SvxFont& rInFont) +Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDevice const * _pPrinter, const SvxFont& rInFont) { sal_uInt16 nScript; sal_uInt16 nIdx = 0; @@ -435,7 +435,7 @@ bool FontPrevWin_Impl::SetFontWidthScale(sal_uInt16 nScale) return false; } -void FontPrevWin_Impl::ScaleFontWidth(vcl::RenderContext& rOutDev) +void FontPrevWin_Impl::ScaleFontWidth(vcl::RenderContext const & rOutDev) { if (!Is100PercentFontWidthValid()) { diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 0ca19dfe68f3..0f9d7cbd1f0c 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -31,7 +31,7 @@ #include <memory> -sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) +sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const & rReq, GraphicObject& rFilterObject ) { const Graphic& rGraphic = rFilterObject.GetGraphic(); sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 38b3ed4332d1..aaa28edeccca 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -71,7 +71,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN // misc local helper functions -static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( Sequence< css::lang::Locale > &rSeq ) +static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( Sequence< css::lang::Locale > const &rSeq ) { const css::lang::Locale *pLocale = rSeq.getConstArray(); sal_Int32 nCount = rSeq.getLength(); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 15897fbc3526..53521b4178bc 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -28,7 +28,7 @@ #include "svx/dlgutil.hxx" // local functions -static void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) +static void lcl_GetMinMax(MetricField const & rField, long& nFirst, long& nLast, long& nMin, long& nMax) { nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) )); nLast = static_cast<long>(rField.Denormalize( rField.GetLast( FUNIT_TWIP ) )); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index fab2f3f9d459..ae8c1223b929 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -677,7 +677,7 @@ void SvxSearchDialog::InitControls_Impl() namespace { - SvtModuleOptions::EFactory getModule(SfxBindings& rBindings) + SvtModuleOptions::EFactory getModule(SfxBindings const & rBindings) { SvtModuleOptions::EFactory eFactory(SvtModuleOptions::EFactory::UNKNOWN_FACTORY); try @@ -1128,10 +1128,10 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void ) ClickHdl_Impl(pCtrl); } -void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) +void SvxSearchDialog::ClickHdl_Impl(void const * pCtrl) { if ( pCtrl && !bSet ) - SetModifyFlag_Impl( static_cast<Control*>(pCtrl) ); + SetModifyFlag_Impl( static_cast<Control const *>(pCtrl) ); else bSet = false; @@ -1780,7 +1780,7 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) } -void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) +void SvxSearchDialog::EnableControl_Impl( Control const * pCtrl ) { if (m_pSearchBtn == pCtrl && ( SearchOptionFlags::SEARCH & nOptions ) ) { diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 7d73630c2925..61dddbfcde3b 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -452,7 +452,7 @@ void SvxNumValueSet::dispose() void SvxNumValueSet::SetNumberingSettings( const Sequence<Sequence<PropertyValue> >& aNum, - Reference<XNumberingFormatter>& xFormat, + Reference<XNumberingFormatter> const & xFormat, const Locale& rLocale ) { aNumSettings = aNum; @@ -469,8 +469,8 @@ void SvxNumValueSet::SetNumberingSettings( } void SvxNumValueSet::SetOutlineNumberingSettings( - Sequence<Reference<XIndexAccess> >& rOutline, - Reference<XNumberingFormatter>& xFormat, + Sequence<Reference<XIndexAccess> > const & rOutline, + Reference<XNumberingFormatter> const & xFormat, const Locale& rLocale) { aOutlineSettings = rOutline; diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index a52678399973..709b1790d1df 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -79,7 +79,7 @@ E3dExtrudeObj::E3dExtrudeObj() SetDefaultAttributes(aDefault); } -void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) +void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes const & rDefault) { GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultExtrudeSmoothed())); GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultExtrudeSmoothFrontBack())); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 1ffa9081976e..0b29842e3284 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -460,7 +460,7 @@ void Svx3DWin::SetUILightState(PushButton& rBtn, bool bState) rBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff ); } -void Svx3DWin::Update( SfxItemSet& rAttrs ) +void Svx3DWin::Update( SfxItemSet const & rAttrs ) { // remember 2d attributes if(mpRemember2DAttributes) diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index a93db14a763a..a13132697d07 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -90,7 +90,7 @@ E3dLatheObj::E3dLatheObj() SetDefaultAttributes(aDefault); } -void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) +void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes const & rDefault) { GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultLatheSmoothed())); GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultLatheSmoothFrontBack())); diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 5bb9e66b2a6d..cff0d5a706d1 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -474,7 +474,7 @@ void E3dObject::Insert3DObj(E3dObject* p3DObj) StructureChanged(); } -void E3dObject::Remove3DObj(E3dObject* p3DObj) +void E3dObject::Remove3DObj(E3dObject const * p3DObj) { DBG_ASSERT(p3DObj, "Remove3DObj with NULL-pointer!"); diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index bb6f9dc0b1d1..1abac13458b3 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -495,7 +495,7 @@ bool E3dView::Paste( } // Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) -bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/) +bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene const * pSrcScene, E3dScene* pDstScene, Point /*aOffset*/) { bool bRetval(false); @@ -622,7 +622,7 @@ bool E3dView::IsConvertTo3DObjPossible() const return bRetval; } -void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, bool& rAny3D, +void E3dView::ImpIsConvertTo3DPossible(SdrObject const * pObj, bool& rAny3D, bool& rGroupSelected) const { if(pObj) @@ -694,7 +694,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) } } -void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) +void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat) { // Single PathObject, transform this SdrPathObj* pPath = dynamic_cast<SdrPathObj*>( pObj ); @@ -762,7 +762,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo } } -void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) +void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat) { if(pObj) { @@ -1035,7 +1035,7 @@ struct E3dDepthLayer } }; -void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) +void E3dView::DoDepthArrange(E3dScene const * pScene, double fDepth) { if(pScene && pScene->GetSubList() && pScene->GetSubList()->GetObjCount() > 1) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 224d0d3dcaf6..5078e793481f 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1744,7 +1744,7 @@ void FmGridControl::HideColumn(sal_uInt16 nId) m_nMarkedColumnId = (sal_uInt16)-1; } -bool FmGridControl::isColumnSelected(DbGridColumn* _pColumn) +bool FmGridControl::isColumnSelected(DbGridColumn const * _pColumn) { OSL_ENSURE(_pColumn,"Column can not be null!"); bool bSelected = false; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 42bf7d6ad49b..0ca5e5922a49 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2401,7 +2401,7 @@ sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) } -void FmXGridPeer::columnVisible(DbGridColumn* pColumn) +void FmXGridPeer::columnVisible(DbGridColumn const * pColumn) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); @@ -2416,7 +2416,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn) } -void FmXGridPeer::columnHidden(DbGridColumn* pColumn) +void FmXGridPeer::columnHidden(DbGridColumn const * pColumn) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 86c44d500897..9c16503bd11e 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -515,7 +515,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, } -void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) +void DbGridColumn::ImplInitWindow( vcl::Window const & rParent, const InitWindowFacet _eInitWhat ) { if ( m_pCell.is() ) m_pCell->ImplInitWindow( rParent, _eInitWhat ); @@ -704,7 +704,7 @@ bool DbCellControl::Commit() } -void DbCellControl::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) +void DbCellControl::ImplInitWindow( vcl::Window const & rParent, const InitWindowFacet _eInitWhat ) { vcl::Window* pWindows[] = { m_pPainter, m_pWindow }; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 79ffdeef4cbe..3d0e05864205 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2665,7 +2665,7 @@ OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const return sRet; } -OUString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGridRowRef& _rRow) const +OUString DbGridControl::GetCurrentRowCellText(DbGridColumn const * pColumn,const DbGridRowRef& _rRow) const { // text output for a single row OUString aText; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 341347147568..fceb54e286b7 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -264,7 +264,7 @@ namespace svxform m_pXFormsPage->DoMenuAction(m_nRemoveId); } - void DataTreeListBox::RemoveEntry( SvTreeListEntry* _pEntry ) + void DataTreeListBox::RemoveEntry( SvTreeListEntry const * _pEntry ) { if ( _pEntry ) { @@ -1445,7 +1445,7 @@ namespace svxform { ModelSelectHdl(&rBox); } - void DataNavigatorWindow::ModelSelectHdl(ListBox* pBox) + void DataNavigatorWindow::ModelSelectHdl(ListBox const * pBox) { sal_Int32 nPos = m_pModelsBox->GetSelectEntryPos(); // pBox == NULL, if you want to force a new fill. @@ -2396,7 +2396,7 @@ namespace svxform } } - void copyPropSet( const Reference< XPropertySet >& xFrom, Reference< XPropertySet >& xTo ) + void copyPropSet( const Reference< XPropertySet >& xFrom, Reference< XPropertySet > const & xTo ) { DBG_ASSERT( xFrom.is(), "copyPropSet(): no source" ); DBG_ASSERT( xTo.is(), "copyPropSet(): no target" ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 33b8770b28d6..064fa09f1c81 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -809,7 +809,7 @@ void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos ) } -bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const +bool FmFilterModel::ValidateText(FmFilterItem const * pItem, OUString& rText, OUString& rErrorMsg) const { FmFormItem* pFormItem = dynamic_cast<FmFormItem*>( pItem->GetParent()->GetParent() ); try @@ -1317,7 +1317,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) namespace { - FmFilterItems* getTargetItems(SvTreeListEntry* _pTarget) + FmFilterItems* getTargetItems(SvTreeListEntry const * _pTarget) { FmFilterData* pData = static_cast<FmFilterData*>(_pTarget->GetUserData()); FmFilterItems* pTargetItems = dynamic_cast<FmFilterItems*>(pData); @@ -1465,7 +1465,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) } -void FmFilterNavigator::Remove(FmFilterData* pItem) +void FmFilterNavigator::Remove(FmFilterData const * pItem) { // the entry for the data SvTreeListEntry* pEntry = FindEntry(pItem); @@ -1826,7 +1826,7 @@ void FmFilterNavigatorWin::dispose() } -void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell) +void FmFilterNavigatorWin::UpdateContent(FmFormShell const * pFormShell) { if (!m_pNavigator) return; diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 82096f99ad93..c43ad1da2ea0 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -210,7 +210,7 @@ namespace svxform } - void OControlTransferData::buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot) + void OControlTransferData::buildPathFormat(SvTreeListBox const * pTreeBox, SvTreeListEntry const * pRoot) { m_aControlPaths.realloc(0); @@ -252,7 +252,7 @@ namespace svxform } - void OControlTransferData::buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot) + void OControlTransferData::buildListFromPath(SvTreeListBox const * pTreeBox, SvTreeListEntry* pRoot) { ListBoxEntrySet aEmpty; m_aSelectedEntries.swap( aEmpty ); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 1b6a86649670..d1127ac7afa9 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -90,7 +90,7 @@ FmFormObjFactory::~FmFormObjFactory() // create css::form::Form objects namespace { - void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) + void lcl_initProperty( FmFormObj const * _pObject, const OUString& _rPropName, const Any& _rValue ) { try { diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 34e9670b7606..af29b8667527 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -148,7 +148,7 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate } -bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, +bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView const * pView, const HelpEvent& rEvt ) { if( pView->IsAction() ) diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 1b4690350137..af79ba17b2b2 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -172,7 +172,7 @@ void FmFormView::MarkListHasChanged() namespace { - const SdrPageWindow* findPageWindow( const SdrPaintView* _pView, OutputDevice* _pWindow ) + const SdrPageWindow* findPageWindow( const SdrPaintView* _pView, OutputDevice const * _pWindow ) { SdrPageView* pPageView = _pView->GetSdrPageView(); if(pPageView) @@ -362,7 +362,7 @@ void FmFormView::HideSdrPage() } -void FmFormView::ActivateControls(SdrPageView* pPageView) +void FmFormView::ActivateControls(SdrPageView const * pPageView) { if (!pPageView) return; @@ -375,7 +375,7 @@ void FmFormView::ActivateControls(SdrPageView* pPageView) } -void FmFormView::DeactivateControls(SdrPageView* pPageView) +void FmFormView::DeactivateControls(SdrPageView const * pPageView) { if( !pPageView ) return; @@ -564,7 +564,7 @@ FmFormObj* FmFormView::getMarkedGrid() const } -void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, +void FmFormView::createControlLabelPair( OutputDevice const * _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl ) diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 49afb8d00201..803705f15ef9 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1013,7 +1013,7 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus, void*, void) } -void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) +void FmXFormView::onCreatedFormObject( FmFormObj const & _rFormObject ) { FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : nullptr; FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : nullptr; @@ -1511,7 +1511,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ } -bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, +bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, @@ -1539,7 +1539,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO } -bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, +bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, @@ -1802,7 +1802,7 @@ void FmXFormView::saveMarkList() } } -static bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj ) +static bool lcl_hasObject( SdrObjListIter& rIter, SdrObject const * pObj ) { bool bFound = false; while (rIter.IsMore() && !bFound) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b8b88183d612..8793ca58dde4 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -87,7 +87,7 @@ namespace svxform typedef MapModelToShape::value_type ModelShapePair; - void collectShapeModelMapping( SdrPage* _pPage, MapModelToShape& _rMapping ) + void collectShapeModelMapping( SdrPage const * _pPage, MapModelToShape& _rMapping ) { OSL_ENSURE( _pPage, "collectShapeModelMapping: invalid arg!" ); @@ -672,14 +672,14 @@ namespace svxform } - bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry ) + bool NavigatorTree::IsFormEntry( SvTreeListEntry const * pEntry ) { FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData()); return !pEntryData || dynamic_cast<const FmFormData*>( pEntryData) != nullptr; } - bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry ) + bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry const * pEntry ) { FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData()); return pEntryData && dynamic_cast<const FmControlData*>( pEntryData) != nullptr; @@ -1303,7 +1303,7 @@ namespace svxform } - void NavigatorTree::NewForm( SvTreeListEntry* pParentEntry ) + void NavigatorTree::NewForm( SvTreeListEntry const * pParentEntry ) { // get ParentFormData @@ -1365,7 +1365,7 @@ namespace svxform } - FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName ) + FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry const * pParentEntry, bool bEditName ) { // get ParentForm @@ -1410,7 +1410,7 @@ namespace svxform } - OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) + OUString NavigatorTree::GenerateName( FmEntryData const * pEntryData ) { const sal_uInt16 nMaxCount = 99; OUString aNewName; @@ -2001,7 +2001,7 @@ namespace svxform } - bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData) + bool NavigatorTree::IsHiddenControl(FmEntryData const * pEntryData) { if (pEntryData == nullptr) return false; @@ -2033,7 +2033,7 @@ namespace svxform pFormView->UnMarkAll(); } - void NavigatorTree::MarkViewObj(FmFormData* pFormData, bool bDeep ) + void NavigatorTree::MarkViewObj(FmFormData const * pFormData, bool bDeep ) { FmFormShell* pFormShell = GetNavModel()->GetFormShell(); if( !pFormShell ) @@ -2078,7 +2078,7 @@ namespace svxform } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } - void NavigatorTree::CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects) + void NavigatorTree::CollectObjects(FmFormData const * pFormData, bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects) { FmEntryDataList* pChildList = pFormData->GetChildList(); FmControlData* pControlData; @@ -2095,7 +2095,7 @@ namespace svxform } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ ) } - void NavigatorTree::MarkViewObj( FmControlData* pControlData) + void NavigatorTree::MarkViewObj( FmControlData const * pControlData) { if( !pControlData ) return; diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index df2fb0f99626..3708f9322e34 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -438,7 +438,7 @@ namespace svxform } - void NavigatorTreeModel::RemoveForm(FmFormData* pFormData) + void NavigatorTreeModel::RemoveForm(FmFormData const * pFormData) { // get form and parent @@ -470,7 +470,7 @@ namespace svxform } - void NavigatorTreeModel::RemoveFormComponent(FmControlData* pControlData) + void NavigatorTreeModel::RemoveFormComponent(FmControlData const * pControlData) { // get control and parent @@ -485,7 +485,7 @@ namespace svxform } - void NavigatorTreeModel::ClearBranch( FmFormData* pParentData ) + void NavigatorTreeModel::ClearBranch( FmFormData const * pParentData ) { // delete all entries of this branch @@ -645,7 +645,7 @@ namespace svxform } - FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs ) + FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData const * pParentData, bool bRecurs ) { FmEntryDataList* pDataList; if( !pParentData ) @@ -880,7 +880,7 @@ namespace svxform } - Reference< XIndexContainer > NavigatorTreeModel::GetFormComponents( FmFormData* pFormData ) + Reference< XIndexContainer > NavigatorTreeModel::GetFormComponents( FmFormData const * pFormData ) { // get components from form diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index af2e399fff7f..46253a195713 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -278,7 +278,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo } -void FmFieldWin::UpdateContent(FmFormShell* pShell) +void FmFieldWin::UpdateContent(FmFormShell const * pShell) { pListBox->Clear(); OUString aTitle(SvxResId(RID_STR_FIELDSELECTION)); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 2428e48cb5dc..2fd0e69bbabe 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -743,7 +743,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry) return pTheme; } -void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme ) +void Gallery::ImplDeleteCachedTheme( GalleryTheme const * pTheme ) { GalleryCacheThemeList::const_iterator aEnd = aThemeCache.end(); for (GalleryCacheThemeList::iterator it = aThemeCache.begin(); it != aEnd; ++it) diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index c5b8013f26a1..4f2d92dd4b92 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -994,7 +994,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo return bRet; } -bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rxModelStream ) +bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream> const & rxModelStream ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); bool bRet = false; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 35d44db70725..06b8e7a5a486 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -134,7 +134,7 @@ namespace svxform sal_uInt16 _nEditId, sal_uInt16 _nRemoveId); void DeleteAndClear(); - void RemoveEntry( SvTreeListEntry* _pEntry ); + void RemoveEntry( SvTreeListEntry const * _pEntry ); }; class ReplaceString @@ -334,7 +334,7 @@ namespace svxform DECL_LINK( MenuActivateHdl, MenuButton *, void ); DECL_LINK( ActivatePageHdl, TabControl*, void); DECL_LINK( UpdateHdl, Timer *, void); - void ModelSelectHdl(ListBox*); + void ModelSelectHdl(ListBox const *); XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); void SetPageModel(); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index b22cb959a4f0..2e8b89007ad9 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -165,7 +165,7 @@ public: void Update(const css::uno::Reference< css::container::XIndexAccess > & xControllers, const css::uno::Reference< css::form::runtime::XFormController > & xCurrent); void Clear(); - bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const; + bool ValidateText(FmFilterItem const * pItem, OUString& rText, OUString& rErrorMsg) const; void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem); void SetTextForItem(FmFilterItem* pItem, const OUString& rText); @@ -269,7 +269,7 @@ protected: void DeleteSelection(); SvTreeListEntry* FindEntry(const FmFilterData* pItem) const; void Insert(FmFilterData* pItem, sal_uLong nPos); - void Remove(FmFilterData* pItem); + void Remove(FmFilterData const * pItem); DECL_LINK(OnRemove, void*, void); DECL_LINK(OnDropActionTimer, Timer*, void); @@ -318,7 +318,7 @@ public: virtual ~FmFilterNavigatorWin() override; virtual void dispose() override; - void UpdateContent( FmFormShell* pFormShell ); + void UpdateContent( FmFormShell const * pFormShell ); void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; void FillInfo( SfxChildWinInfo& rInfo ) const override; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 0b09eadf0839..c0c210f963f0 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -168,12 +168,12 @@ namespace svxform const css::uno::Reference< css::form::XForms >& _rxFormsRoot ) { m_xFormsRoot = _rxFormsRoot; } - void buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); + void buildPathFormat(SvTreeListBox const * pTreeBox, SvTreeListEntry const * pRoot); // assembles m_aControlPaths from m_aSelectedEntries // (it is assumed that the entries are sorted in m_aSelectedEntries with respect to the neighbor relationship) - void buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); + void buildListFromPath(SvTreeListBox const * pTreeBox, SvTreeListEntry* 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 f7be4afc3ddc..5012bd3f4900 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -326,10 +326,10 @@ namespace svxform void UpdateContent( const css::uno::Reference< css::form::XForms >& xForms ); void InsertForm(const css::uno::Reference< css::form::XForm >& xForm, sal_uInt32 nRelPos); - void RemoveForm(FmFormData* pFormData); + void RemoveForm(FmFormData const * pFormData); void InsertFormComponent(const css::uno::Reference< css::form::XFormComponent >& xComp, sal_uInt32 nRelPos); - void RemoveFormComponent(FmControlData* pControlData); + void RemoveFormComponent(FmControlData const * pControlData); void InsertSdrObj(const SdrObject* pSdrObj); void RemoveSdrObj(const SdrObject* pSdrObj); @@ -346,7 +346,7 @@ namespace svxform virtual ~NavigatorTreeModel() override; void FillBranch( FmFormData* pParentData ); - void ClearBranch( FmFormData* pParentData ); + void ClearBranch( FmFormData const * pParentData ); void UpdateContent( FmFormShell* pNewShell ); void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = CONTAINER_APPEND, @@ -362,9 +362,9 @@ namespace svxform FmFormShell* GetFormShell() const { return m_pFormShell; } FmFormPage* GetFormPage() const { return m_pFormPage; } FmEntryData* FindData( const css::uno::Reference< css::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true ); - FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs ); + FmEntryData* FindData( const OUString& rText, FmFormData const * pParentData, bool bRecurs ); FmEntryDataList* GetRootList() const { return m_pRootList; } - static css::uno::Reference< css::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); + static css::uno::Reference< css::container::XIndexContainer > GetFormComponents( FmFormData const * pParentFormData ); SdrObject* Search(SdrObjListIter& rIter, const css::uno::Reference< css::form::XFormComponent >& xComp); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -411,8 +411,8 @@ namespace svxform bool m_bInitialUpdate : 1; // am I the first time in the UpdateContent? bool m_bKeyboardCut : 1; - FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName ); - void NewForm( SvTreeListEntry* pParentEntry ); + FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry const * pParentEntry, bool bEditName ); + void NewForm( SvTreeListEntry const * pParentEntry ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos ); void Remove( FmEntryData* pEntryData ); @@ -440,7 +440,7 @@ namespace svxform void SynchronizeMarkList(); // reverse direction of SynchronizeMarkList: selects in the view all controls corresponding to the current selection - void CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< css::uno::Reference< css::form::XFormComponent > >& _rObjects); + void CollectObjects(FmFormData const * pFormData, bool bDeep, ::std::set< css::uno::Reference< css::form::XFormComponent > >& _rObjects); // in the Select I usually update the Marklist of the corresponding view, // with the following functions I can control the locking of this behavior @@ -448,7 +448,7 @@ namespace svxform void UnlockSelectionHandling() { --m_nSelectLock; } bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; } - static bool IsHiddenControl(FmEntryData* pEntryData); + static bool IsHiddenControl(FmEntryData const * pEntryData); DECL_LINK( OnEdit, void*, void ); DECL_LINK( OnDropActionTimer, Timer*, void ); @@ -472,14 +472,14 @@ namespace svxform void Clear(); void UpdateContent( FmFormShell* pFormShell ); - void MarkViewObj( FmFormData* pFormData, bool bDeep ); - void MarkViewObj( FmControlData* pControlData ); + void MarkViewObj( FmFormData const * pFormData, bool bDeep ); + void MarkViewObj( FmControlData const * pControlData ); void UnmarkAllViewObj(); - static bool IsFormEntry( SvTreeListEntry* pEntry ); - static bool IsFormComponentEntry( SvTreeListEntry* pEntry ); + static bool IsFormEntry( SvTreeListEntry const * pEntry ); + static bool IsFormComponentEntry( SvTreeListEntry const * pEntry ); - OUString GenerateName( FmEntryData* pEntryData ); + OUString GenerateName( FmEntryData const * pEntryData ); NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 603ed2fecfd0..4f028144851a 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -232,7 +232,7 @@ public: */ void resumeTabOrderUpdate(); - void onCreatedFormObject( FmFormObj& _rFormObject ); + void onCreatedFormObject( FmFormObj const & _rFormObject ); void breakCreateFormObject(); @@ -250,7 +250,7 @@ private: SdrObject* implCreateXFormsControl( const svx::OXFormsDescriptor &_rDesc ); static bool createControlLabelPair( - OutputDevice& _rOutDev, + OutputDevice const & _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const css::uno::Reference< css::beans::XPropertySet >& _rxField, @@ -267,7 +267,7 @@ private: ); bool createControlLabelPair( - OutputDevice& _rOutDev, + OutputDevice const & _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const css::uno::Reference< css::beans::XPropertySet >& _rxField, diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 74372fc48700..2a9d33ea0903 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -166,7 +166,7 @@ public: void SetReadOnly(bool bRead){m_bReadOnly = bRead;} void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;} - void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); + void ImplInitWindow( vcl::Window const & rParent, const InitWindowFacet _eInitWhat ); // properties that can bleed through onto the css::frame::Controller sal_Int16 SetAlignment(sal_Int16 _nAlign); @@ -292,7 +292,7 @@ public: virtual void PaintFieldToCell( OutputDevice& rDev, const tools::Rectangle& rRect, const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter); virtual void PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect ); - void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); + void ImplInitWindow( vcl::Window const & rParent, const InitWindowFacet _eInitWhat ); double GetValue(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; @@ -779,7 +779,7 @@ public: virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; bool Commit() {return m_pCellControl->Commit();} - void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) + void ImplInitWindow( vcl::Window const & rParent, const InitWindowFacet _eInitWhat ) { m_pCellControl->ImplInitWindow( rParent, _eInitWhat ); } bool isAlignedController() const { return m_pCellControl->isAlignedController(); } diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 73d98dbe5ec3..e855fc86d337 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -89,7 +89,7 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; - void UpdateContent(FmFormShell*); + void UpdateContent(FmFormShell const *); void UpdateContent(const css::uno::Reference< css::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const override; diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 232abcf5f622..66592354a9cc 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -216,7 +216,7 @@ namespace sdr // This is the call from the destructor of the asynch graphic loading event. // No one else has to call this. It is needed to let this object forget about // the event. The parameter allows checking for the correct event. - void ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent* pEvent) + void ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent const * pEvent) { if(mpAsynchLoadEvent) { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index d060de4bc2ac..9f5e8debaf24 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -594,7 +594,7 @@ namespace sdr { namespace contact { /// creates an XControl for the given device and SdrUnoObj static bool createControlForDevice( - IPageViewAccess& _rPageView, + IPageViewAccess const & _rPageView, const OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, const basegfx::B2DHomMatrix& _rInitialViewTransformation, @@ -700,7 +700,7 @@ namespace sdr { namespace contact { We're not disposed. */ static void impl_adjustControlVisibilityToLayerVisibility_throw( const ControlHolder& _rxControl, const SdrUnoObj& _rUnoObject, - IPageViewAccess& _rPageView, bool _bIsCurrentlyVisible, bool _bForce ); + IPageViewAccess const & _rPageView, bool _bIsCurrentlyVisible, bool _bForce ); /** starts or stops listening at various aspects of our control @@ -757,7 +757,7 @@ namespace sdr { namespace contact { /** ensures that we have a control for the given PageView/OutputDevice */ bool impl_ensureControl_nothrow( - IPageViewAccess& _rPageView, + IPageViewAccess const & _rPageView, const OutputDevice& _rDevice, const basegfx::B2DHomMatrix& _rInitialViewTransformation ); @@ -988,7 +988,7 @@ namespace sdr { namespace contact { } - bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice, + bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess const & _rPageView, const OutputDevice& _rDevice, const basegfx::B2DHomMatrix& _rInitialViewTransformation ) { if ( m_bCreatingControl ) @@ -1065,7 +1065,7 @@ namespace sdr { namespace contact { } - bool ViewObjectContactOfUnoControl_Impl::createControlForDevice( IPageViewAccess& _rPageView, + bool ViewObjectContactOfUnoControl_Impl::createControlForDevice( IPageViewAccess const & _rPageView, const OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, const basegfx::B2DHomMatrix& _rInitialViewTransformation, const basegfx::B2DHomMatrix& _rInitialZoomNormalization, ControlHolder& _out_rControl ) { @@ -1167,7 +1167,7 @@ namespace sdr { namespace contact { void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( const ControlHolder& _rControl, - const SdrUnoObj& _rUnoObject, IPageViewAccess& _rPageView, bool _bIsCurrentlyVisible, bool _bForce ) + const SdrUnoObj& _rUnoObject, IPageViewAccess const & _rPageView, bool _bIsCurrentlyVisible, bool _bForce ) { // in design mode, there is no problem with the visibility: The XControl is hidden by // default, and the Drawing Layer will simply not call our paint routine, if we're in diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 36b62dd15e57..b358160d4760 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -56,7 +56,7 @@ AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup() disposeOnce(); } -void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem* pGradientItem) +void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem const * pGradientItem) { const XGradient& rGradient = pGradientItem->GetGradientValue(); @@ -85,7 +85,7 @@ void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem* pGrad maMtrTrgrBorder->SetValue(aGradient.GetBorder()); } -void AreaTransparencyGradientPopup::Rearrange(XFillFloatTransparenceItem* pGradientItem) +void AreaTransparencyGradientPopup::Rearrange(XFillFloatTransparenceItem const * pGradientItem) { InitStatus(pGradientItem); const XGradient& rGradient = pGradientItem->GetGradientValue(); diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index 637fa8fb9ed4..9c31541f46e0 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -51,7 +51,7 @@ void LineWidthValueSet::dispose() ValueSet::dispose(); } -void LineWidthValueSet::SetUnit(OUString* str) +void LineWidthValueSet::SetUnit(OUString const * str) { for(int i = 0; i < 9; i++) { diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index f2747d5311ea..c3a1e06e787b 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -32,7 +32,7 @@ public: virtual ~LineWidthValueSet() override; virtual void dispose() override; - void SetUnit(OUString* str); + void SetUnit(OUString const * str); void SetSelItem(sal_uInt16 nSel); sal_uInt16 GetSelItem() { return nSelItem;} void SetImage(const Image& img); diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 48c60644a71d..aaf5f82d3dee 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -85,7 +85,7 @@ void TextUnderlineControl::dispose() SfxPopupWindow::dispose(); } -FontLineStyle TextUnderlineControl::getLineStyle(Button* pButton) +FontLineStyle TextUnderlineControl::getLineStyle(Button const * pButton) { if(pButton == maSingle) return LINESTYLE_SINGLE; diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index fe7cbf3da300..db9cfe8bdcf2 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -49,7 +49,7 @@ private: VclPtr<PushButton> maWave; VclPtr<PushButton> maMoreOptions; - FontLineStyle getLineStyle(Button* pButton); + FontLineStyle getLineStyle(Button const * pButton); DECL_LINK(PBClickHdl, Button*, void); }; diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index b25ae340d0e4..69f73b51d44f 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -27,7 +27,7 @@ #include <vcl/outdev.hxx> -void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, const SdrObject* pObj) +void GradTransformer::GradToVec(GradTransGradient const & rG, GradTransVector& rV, const SdrObject* pObj) { // handle start color rV.aCol1 = rG.aGradient.GetStartColor(); @@ -179,7 +179,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons } -void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, +void GradTransformer::VecToGrad(GradTransVector const & rV, GradTransGradient& rG, GradTransGradient const & rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst) { // fill old gradient to new gradient to have a base diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx index d8efa391b680..7e6e02f1854e 100644 --- a/svx/source/svdraw/gradtrns.hxx +++ b/svx/source/svdraw/gradtrns.hxx @@ -45,10 +45,10 @@ class GradTransformer public: GradTransformer() {} - static void GradToVec(GradTransGradient& rG, GradTransVector& rV, + static void GradToVec(GradTransGradient const & rG, GradTransVector& rV, const SdrObject* pObj); - static void VecToGrad(GradTransVector& rV, GradTransGradient& rG, - GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst); + static void VecToGrad(GradTransVector const & rV, GradTransGradient& rG, + GradTransGradient const & rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst); }; #endif // INCLUDED_SVX_SOURCE_SVDRAW_GRADTRNS_HXX diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index c3fc94e02c9f..6ca29201b6d1 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -38,7 +38,7 @@ class CandidateMgr std::set<VclPtr<vcl::Window> > m_aDeletedCandidates; DECL_LINK(WindowEventListener, VclWindowEvent&, void); public: - void PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect); + void PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect); ~CandidateMgr(); }; @@ -62,7 +62,7 @@ CandidateMgr::~CandidateMgr() } } -void PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect) +void PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect) { if (!rWindow.IsChildTransparentModeEnabled()) return; @@ -71,7 +71,7 @@ void PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPi aManager.PaintTransparentChildren(rWindow, rPixelRect); } -void CandidateMgr::PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect) +void CandidateMgr::PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect) { vcl::Window * pCandidate = rWindow.GetWindow( GetWindowType::FirstChild ); while (pCandidate) diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 1f822d43d00e..92d2ae87e542 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -2811,7 +2811,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const #define DRAG_CROOK_RASTER_MAXIMUM (15) #define DRAG_CROOK_RASTER_DISTANCE (30) -basegfx::B2DPolyPolygon impCreateDragRaster(SdrPageView& rPageView, const tools::Rectangle& rMarkRect) +basegfx::B2DPolyPolygon impCreateDragRaster(SdrPageView const & rPageView, const tools::Rectangle& rMarkRect) { basegfx::B2DPolyPolygon aRetval; diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 3b1e8d687954..ef72376bc0c4 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -112,7 +112,7 @@ void SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos) mpModel->SetChanged(); } -bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const +bool SdrEditView::ImpDelLayerCheck(SdrObjList const * pOL, SdrLayerID nDelID) const { bool bDelAll(true); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 84bf0b375bc2..9c7193c7a55a 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1995,7 +1995,7 @@ void SdrEditView::ConvertMarkedToPolyObj() namespace { - GDIMetaFile GetMetaFile(SdrGrafObj* pGraf) + GDIMetaFile GetMetaFile(SdrGrafObj const * pGraf) { if (pGraf->HasGDIMetaFile()) return pGraf->GetTransformedGraphic(SdrGrafObjTransformsAttrs::COLOR|SdrGrafObjTransformsAttrs::MIRROR).GetGDIMetaFile(); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 02faf7d3a171..ee854da6eb6d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -166,7 +166,7 @@ SdrPageView* SdrObjEditView::ShowSdrPage(SdrPage* pPage) } /// Removes outliner views registered in other draw views that use pOutputDevice. -void lcl_RemoveTextEditOutlinerViews(SdrObjEditView* pThis, SdrPageView* pPageView, OutputDevice* pOutputDevice) +void lcl_RemoveTextEditOutlinerViews(SdrObjEditView const * pThis, SdrPageView const * pPageView, OutputDevice const * pOutputDevice) { if (!comphelper::LibreOfficeKit::isActive()) return; @@ -454,7 +454,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const tools:: rOutlView.ShowCursor(/*bGotoCursor=*/true, /*bActivate=*/true); } -void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const +void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView const & rOutlView) const { vcl::Window* pWin = rOutlView.GetWindow(); @@ -1277,7 +1277,7 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const } -OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const +OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window const * pWin) const { if (pWin==nullptr) return nullptr; if (pTextEditOutliner==nullptr) return nullptr; @@ -2258,7 +2258,7 @@ static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, return aPaintSet; } -void SdrObjEditView::ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ) +void SdrObjEditView::ApplyFormatPaintBrushToText( SfxItemSet const & rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ) { OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr; if(pParaObj) diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 54b8604b1dcd..0837835642b0 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -116,7 +116,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( checkClip(); } -void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile& rMtf, SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport) +void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile const & rMtf, SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport) { const sal_uLong nCount(rMtf.GetActionSize()); @@ -259,7 +259,7 @@ size_t ImpSdrGDIMetaFileImport::DoImport( sal_uInt32 nActionsToReport(0); // execute - DoLoopActions(const_cast< GDIMetaFile& >(rMtf), pProgrInfo, &nActionsToReport); + DoLoopActions(rMtf, pProgrInfo, &nActionsToReport); if(pProgrInfo) { @@ -659,7 +659,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale) } } -void ImpSdrGDIMetaFileImport::DoAction(MetaLineAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaLineAction const & rAct) { // #i73407# reformulation to use new B2DPolygon classes const basegfx::B2DPoint aStart(rAct.GetStartPoint().X(), rAct.GetStartPoint().Y()); @@ -702,14 +702,14 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaLineAction& rAct) } } -void ImpSdrGDIMetaFileImport::DoAction(MetaRectAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaRectAction const & rAct) { SdrRectObj* pRect=new SdrRectObj(rAct.GetRect()); SetAttributes(pRect); InsertObj(pRect); } -void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction const & rAct) { SdrRectObj* pRect=new SdrRectObj(rAct.GetRect()); SetAttributes(pRect); @@ -722,14 +722,14 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct) InsertObj(pRect); } -void ImpSdrGDIMetaFileImport::DoAction(MetaEllipseAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaEllipseAction const & rAct) { SdrCircObj* pCirc=new SdrCircObj(OBJ_CIRC,rAct.GetRect()); SetAttributes(pCirc); InsertObj(pCirc); } -void ImpSdrGDIMetaFileImport::DoAction(MetaArcAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaArcAction const & rAct) { Point aCenter(rAct.GetRect().Center()); long nStart=GetAngle(rAct.GetStartPoint()-aCenter); @@ -739,7 +739,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaArcAction& rAct) InsertObj(pCirc); } -void ImpSdrGDIMetaFileImport::DoAction(MetaPieAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaPieAction const & rAct) { Point aCenter(rAct.GetRect().Center()); long nStart=GetAngle(rAct.GetStartPoint()-aCenter); @@ -749,7 +749,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaPieAction& rAct) InsertObj(pCirc); } -void ImpSdrGDIMetaFileImport::DoAction(MetaChordAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaChordAction const & rAct) { Point aCenter(rAct.GetRect().Center()); long nStart=GetAngle(rAct.GetStartPoint()-aCenter); @@ -883,7 +883,7 @@ bool ImpSdrGDIMetaFileImport::isClip() const return !maClip.getB2DRange().isEmpty(); } -void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction& rAct ) +void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction const & rAct ) { // #i73407# reformulation to use new B2DPolygon classes basegfx::B2DPolygon aSource(rAct.GetPolygon().getB2DPolygon()); @@ -927,7 +927,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction& rAct ) } } -void ImpSdrGDIMetaFileImport::DoAction( MetaPolygonAction& rAct ) +void ImpSdrGDIMetaFileImport::DoAction( MetaPolygonAction const & rAct ) { // #i73407# reformulation to use new B2DPolygon classes basegfx::B2DPolygon aSource(rAct.GetPolygon().getB2DPolygon()); @@ -948,7 +948,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaPolygonAction& rAct ) } } -void ImpSdrGDIMetaFileImport::DoAction(MetaPolyPolygonAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaPolyPolygonAction const & rAct) { // #i73407# reformulation to use new B2DPolygon classes basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon()); @@ -1033,28 +1033,28 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt InsertObj( pText, false ); } -void ImpSdrGDIMetaFileImport::DoAction(MetaTextAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaTextAction const & rAct) { OUString aStr(rAct.GetText()); aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen()); ImportText( rAct.GetPoint(), aStr, rAct ); } -void ImpSdrGDIMetaFileImport::DoAction(MetaTextArrayAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaTextArrayAction const & rAct) { OUString aStr(rAct.GetText()); aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen()); ImportText( rAct.GetPoint(), aStr, rAct ); } -void ImpSdrGDIMetaFileImport::DoAction(MetaStretchTextAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaStretchTextAction const & rAct) { OUString aStr(rAct.GetText()); aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen()); ImportText( rAct.GetPoint(), aStr, rAct ); } -void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction const & rAct) { tools::Rectangle aRect(rAct.GetPoint(),rAct.GetBitmap().GetSizePixel()); aRect.Right()++; aRect.Bottom()++; @@ -1066,7 +1066,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction const & rAct) { tools::Rectangle aRect(rAct.GetPoint(),rAct.GetSize()); aRect.Right()++; aRect.Bottom()++; @@ -1078,7 +1078,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction const & rAct) { tools::Rectangle aRect(rAct.GetPoint(),rAct.GetBitmapEx().GetSizePixel()); aRect.Right()++; aRect.Bottom()++; @@ -1090,7 +1090,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction const & rAct) { tools::Rectangle aRect(rAct.GetPoint(),rAct.GetSize()); aRect.Right()++; aRect.Bottom()++; @@ -1103,7 +1103,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) } -void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) +void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction const & rAct ) { // #i73407# reformulation to use new B2DPolygon classes basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon()); @@ -1187,7 +1187,7 @@ void ImpSdrGDIMetaFileImport::MapScaling() } -void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rMtf, sal_uLong& a) // GDIMetaFile* pMtf ) +void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction const & rAct, GDIMetaFile const & rMtf, sal_uLong& a) // GDIMetaFile* pMtf ) { bool aSkipComment = false; @@ -1258,7 +1258,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rM } } -void ImpSdrGDIMetaFileImport::DoAction(MetaTextRectAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaTextRectAction const & rAct) { GDIMetaFile aTemp; @@ -1266,7 +1266,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaTextRectAction& rAct) DoLoopActions(aTemp, nullptr, nullptr); } -void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction const & rAct) { tools::Rectangle aRect(rAct.GetDestPoint(), rAct.GetDestSize()); Bitmap aBitmap(rAct.GetBitmap()); @@ -1282,7 +1282,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction const & rAct) { tools::Rectangle aRect(rAct.GetDestPoint(),rAct.GetDestSize()); BitmapEx aBitmapEx(rAct.GetBitmapEx()); @@ -1298,7 +1298,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction const & rAct) { tools::Rectangle aRect(rAct.GetPoint(), rAct.GetBitmap().GetSizePixel()); BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor()); @@ -1312,7 +1312,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction const & rAct) { tools::Rectangle aRect(rAct.GetPoint(), rAct.GetSize()); BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor()); @@ -1326,7 +1326,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction& rAct) InsertObj(pGraf); } -void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction const & rAct) { tools::Rectangle aRect(rAct.GetDestPoint(), rAct.GetDestSize()); BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor()); @@ -1369,7 +1369,7 @@ namespace } } -void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction const & rAct) { basegfx::B2DRange aRange(rAct.GetRect().Left(), rAct.GetRect().Top(), rAct.GetRect().Right(), rAct.GetRect().Bottom()); @@ -1409,7 +1409,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct) } } -void ImpSdrGDIMetaFileImport::DoAction(MetaTransparentAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaTransparentAction const & rAct) { basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon()); @@ -1426,7 +1426,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaTransparentAction& rAct) } } -void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction const & rAct) { basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon()); @@ -1465,7 +1465,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct) } } -void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) +void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction const & rAct) { const GDIMetaFile& rMtf = rAct.GetGDIMetaFile(); diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 7b3d0d12315a..2c6fa3ee025d 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -88,24 +88,24 @@ protected: bool isClip() const; // actions - void DoAction(MetaLineAction & rAct); - void DoAction(MetaRectAction & rAct); - void DoAction(MetaRoundRectAction & rAct); - void DoAction(MetaEllipseAction & rAct); - void DoAction(MetaArcAction & rAct); - void DoAction(MetaPieAction & rAct); - void DoAction(MetaChordAction & rAct); - void DoAction(MetaPolyLineAction & rAct); - void DoAction(MetaPolygonAction & rAct); - void DoAction(MetaPolyPolygonAction & rAct); - void DoAction(MetaTextAction & rAct); - void DoAction(MetaTextArrayAction & rAct); - void DoAction(MetaStretchTextAction & rAct); - void DoAction(MetaBmpAction & rAct); - void DoAction(MetaBmpScaleAction & rAct); - void DoAction(MetaBmpExAction & rAct); - void DoAction(MetaBmpExScaleAction & rAct); - void DoAction(MetaHatchAction & rAct); + void DoAction(MetaLineAction const & rAct); + void DoAction(MetaRectAction const & rAct); + void DoAction(MetaRoundRectAction const & rAct); + void DoAction(MetaEllipseAction const & rAct); + void DoAction(MetaArcAction const & rAct); + void DoAction(MetaPieAction const & rAct); + void DoAction(MetaChordAction const & rAct); + void DoAction(MetaPolyLineAction const & rAct); + void DoAction(MetaPolygonAction const & rAct); + void DoAction(MetaPolyPolygonAction const & rAct); + void DoAction(MetaTextAction const & rAct); + void DoAction(MetaTextArrayAction const & rAct); + void DoAction(MetaStretchTextAction const & rAct); + void DoAction(MetaBmpAction const & rAct); + void DoAction(MetaBmpScaleAction const & rAct); + void DoAction(MetaBmpExAction const & rAct); + void DoAction(MetaBmpExScaleAction const & rAct); + void DoAction(MetaHatchAction const & rAct); void DoAction(MetaLineColorAction & rAct); void DoAction(MetaMapModeAction & rAct); void DoAction(MetaFillColorAction & rAct) { rAct.Execute(mpVD); } @@ -123,21 +123,21 @@ protected: // #i125211# The MetaCommentAction needs to advance (if used), thus // give current metafile and index which may be changed - void DoAction(MetaCommentAction& rAct, GDIMetaFile& rMtf, sal_uLong& a); + void DoAction(MetaCommentAction const & rAct, GDIMetaFile const & rMtf, sal_uLong& a); // missing actions added - void DoAction(MetaTextRectAction& rAct); - void DoAction(MetaBmpScalePartAction& rAct); - void DoAction(MetaBmpExScalePartAction& rAct); - void DoAction(MetaMaskAction& rAct); - void DoAction(MetaMaskScaleAction& rAct); - void DoAction(MetaMaskScalePartAction& rAct); - void DoAction(MetaGradientAction& rAct); - void DoAction(MetaTransparentAction& rAct); + void DoAction(MetaTextRectAction const & rAct); + void DoAction(MetaBmpScalePartAction const & rAct); + void DoAction(MetaBmpExScalePartAction const & rAct); + void DoAction(MetaMaskAction const & rAct); + void DoAction(MetaMaskScaleAction const & rAct); + void DoAction(MetaMaskScalePartAction const & rAct); + void DoAction(MetaGradientAction const & rAct); + void DoAction(MetaTransparentAction const & rAct); void DoAction(MetaRefPointAction& rAct) { rAct.Execute(mpVD); } void DoAction(MetaTextLineColorAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } - void DoAction(MetaFloatTransparentAction& rAct); - void DoAction(MetaGradientExAction& rAct); + void DoAction(MetaFloatTransparentAction const & rAct); + void DoAction(MetaGradientExAction const & rAct); void DoAction(MetaLayoutModeAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } void DoAction(MetaTextLanguageAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } void DoAction(MetaOverlineColorAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } @@ -151,7 +151,7 @@ protected: bool CheckLastLineMerge(const basegfx::B2DPolygon& rSrcPoly); bool CheckLastPolyLineAndFillMerge(const basegfx::B2DPolyPolygon& rPolyPolygon); - void DoLoopActions(GDIMetaFile& rMtf, SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport); + void DoLoopActions(GDIMetaFile const & rMtf, SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport); private: // Copy assignment is forbidden and not implemented. diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 16833fa6346d..9c1ca2fed77e 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -83,7 +83,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co } -static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*) +static void ImpGetEscDir(SdrGluePoint & rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); if (nRet!=FUZZY) { @@ -126,7 +126,7 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, boo } -static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*) +static void ImpGetPercent(SdrGluePoint & rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); if (nRet!=FUZZY) { @@ -162,7 +162,7 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn) } -static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet) +static void ImpGetAlign(SdrGluePoint & rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet) { SdrAlign& nRet=*const_cast<SdrAlign *>(static_cast<SdrAlign const *>(pnRet)); bool& bDontCare=*const_cast<bool *>(static_cast<bool const *>(pbDontCare)); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 495bf3781b3d..769eac8311fa 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1058,7 +1058,7 @@ void SdrItemBrowser::GetFocus() aBrowse->GrabFocus(); } -vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) +vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView const & rView) { const sal_uInt32 nWinCount(rView.PaintWindowCount()); diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index c5506f3b1c06..df617e4c5946 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -603,7 +603,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const return rName; } -bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, tools::Rectangle& rRect) const +bool SdrMarkList::TakeBoundRect(SdrPageView const * pPV, tools::Rectangle& rRect) const { bool bFnd(false); tools::Rectangle aR; @@ -634,7 +634,7 @@ bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, tools::Rectangle& rRect) const return bFnd; } -bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, tools::Rectangle& rRect) const +bool SdrMarkList::TakeSnapRect(SdrPageView const * pPV, tools::Rectangle& rRect) const { bool bFnd(false); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4fca8bb55982..ba495561f835 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -844,7 +844,7 @@ uno::Reference<embed::XStorage> SdrModel::GetDocumentStorage() const uno::Reference<io::XInputStream> SdrModel::GetDocumentStream( OUString const& rURL, - ::comphelper::LifecycleProxy & rProxy) const + ::comphelper::LifecycleProxy const & rProxy) const { uno::Reference<embed::XStorage> const xStorage(GetDocumentStorage()); if (!xStorage.is()) diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 9927b54cfed1..ce62affb411c 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1327,7 +1327,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) } -bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const +bool SdrMarkView::IsObjMarkable(SdrObject const * pObj, SdrPageView const * pPV) const { if (pObj) { @@ -1601,7 +1601,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool } } -bool SdrMarkView::IsObjMarked(SdrObject* pObj) const +bool SdrMarkView::IsObjMarked(SdrObject const * pObj) const { return TryToFindMarkedObject(pObj)!=SAL_MAX_SIZE; } @@ -1687,11 +1687,11 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT return pRet; } -SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const +SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const { return (*this).CheckSingleSdrObjectHit(rPnt,nTol,pOL,pPV,nOptions,pMVisLay,rpRootObj,nullptr); } -SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const +SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const { SdrObject* pRet=nullptr; rpRootObj=nullptr; @@ -1916,7 +1916,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie } -void SdrMarkView::UnmarkAllObj(SdrPageView* pPV) +void SdrMarkView::UnmarkAllObj(SdrPageView const * pPV) { if (GetMarkedObjectCount()!=0) { BrkAction(); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index fe94193a1df4..7f2957006a7b 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -445,7 +445,7 @@ void SdrCaptionObj::ImpRecalcTail() // tail end pos for SdrCaptionType::Type1. This sure was the simplest method // to achieve this, at the cost of making a whole group of const methods // of this object implicitly change the object's position. -void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect) +void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect) { tools::Polygon aPol(2); Point aTl(rPoly[0]); @@ -471,7 +471,7 @@ void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPo rPoly = aPol; } -void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect) +void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect) { // Gap/EscDir/EscPos/Angle tools::Polygon aPol(2); Point aTl(rPoly[0]); @@ -488,7 +488,7 @@ void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPo rPoly=aPol; } -void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect) +void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect) { // Gap/EscDir/EscPos/Angle/LineLen tools::Polygon aPol(3); Point aTl(rPoly[0]); @@ -521,7 +521,7 @@ void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPo rPoly=aPol; } -void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect) +void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect) { switch (rPara.eType) { case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break; diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 33220dc67910..04fa7b49e0cc 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -367,7 +367,7 @@ public: nStart(0), nEnd(0) {} - void SetCreateParams(SdrDragStat& rStat); + void SetCreateParams(SdrDragStat const & rStat); }; sal_uInt32 SdrCircObj::GetHdlCount() const @@ -607,7 +607,7 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const } -void ImpCircUser::SetCreateParams(SdrDragStat& rStat) +void ImpCircUser::SetCreateParams(SdrDragStat const & rStat) { rStat.TakeCreateRect(aR); aR.Justify(); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 9ef591618ca2..c2081a03df84 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -588,7 +588,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() } } -SdrEscapeDirection SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) +SdrEscapeDirection SdrEdgeObj::ImpCalcEscAngle(SdrObject const * pObj, const Point& rPt) { if (pObj==nullptr) return SdrEscapeDirection::ALL; tools::Rectangle aR(pObj->GetSnapRect()); diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index a1220e7afe1f..2387c5888a8f 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -376,7 +376,7 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream /// copy a stream from XStorage to temp file static bool lcl_HandlePackageURL( OUString const & rURL, - SdrModel *const pModel, + SdrModel const *const pModel, OUString & o_rTempFileURL) { if (!pModel) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index bdda4a5bc39c..543fde87da3a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1695,7 +1695,7 @@ void SdrOle2Obj::GetNewReplacement() mpImpl->mxObjRef.UpdateReplacement(); } -Size SdrOle2Obj::GetOrigObjSize( MapMode* pTargetMapMode ) const +Size SdrOle2Obj::GetOrigObjSize( MapMode const * pTargetMapMode ) const { return mpImpl->mxObjRef.GetSize( pTargetMapMode ); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index f82c22977821..9b6083e67764 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -269,12 +269,12 @@ public: XPolygon GetFormPoly() const; void CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; - void CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + void CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView const * pView); XPolygon GetCirclePoly() const; - void CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); - static Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView); + void CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView const * pView); + static Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView const * pView); XPolygon GetLinePoly() const; - void CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + void CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView const * pView); XPolygon GetRectPoly() const; }; @@ -310,7 +310,7 @@ XPolygon ImpPathCreateUser::GetBezierPoly() const return aXP; } -void ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +void ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView const * pView) { long nTangAngle=GetAngle(rDir); aCircStart=rP1; @@ -382,7 +382,7 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const } } -Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, SdrView* pView) +Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, SdrView const * pView) { long x=aCsr.X(); long y=aCsr.Y(); @@ -406,7 +406,7 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr return Point(x,y); } -void ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +void ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView const * pView) { aLineStart=rP1; aLineEnd=rP2; @@ -435,7 +435,7 @@ XPolygon ImpPathCreateUser::GetLinePoly() const return aXP; } -void ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +void ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView const * pView) { aRectP1=rP1; aRectP2=rP1; @@ -509,9 +509,9 @@ public: explicit ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject); // drag stuff - bool beginPathDrag( SdrDragStat& rDrag ) const; + bool beginPathDrag( SdrDragStat const & rDrag ) const; bool movePathDrag( SdrDragStat& rDrag ) const; - bool endPathDrag( SdrDragStat& rDrag ); + bool endPathDrag( SdrDragStat const & rDrag ); OUString getSpecialDragComment(const SdrDragStat& rDrag) const; basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; @@ -544,7 +544,7 @@ ImpPathForDragAndCreate::ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject) { } -bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const +bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat const & rDrag ) const { const SdrHdl* pHdl=rDrag.GetHdl(); if(!pHdl) @@ -822,7 +822,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const return true; } -bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) +bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat const & rDrag) { Point aLinePt1; Point aLinePt2; @@ -2195,7 +2195,7 @@ OUString SdrPathObj::getSpecialDragComment(const SdrDragStat& rDrag) const else { ImpPathForDragAndCreate aDragAndCreate(*const_cast<SdrPathObj*>(this)); - bool bDidWork(aDragAndCreate.beginPathDrag(const_cast<SdrDragStat&>(rDrag))); + bool bDidWork(aDragAndCreate.beginPathDrag(rDrag)); if(bDidWork) { @@ -2210,7 +2210,7 @@ basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat& rDrag) { basegfx::B2DPolyPolygon aRetval; ImpPathForDragAndCreate aDragAndCreate(*const_cast<SdrPathObj*>(this)); - bool bDidWork(aDragAndCreate.beginPathDrag(const_cast<SdrDragStat&>(rDrag))); + bool bDidWork(aDragAndCreate.beginPathDrag(rDrag)); if(bDidWork) { diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 21d588fc89f7..55e21e79311e 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -439,7 +439,7 @@ sal_uInt16 SdrTextObj::GetObjIdentifier() const return sal_uInt16(eTextKind); } -bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) +bool SdrTextObj::HasTextImpl( SdrOutliner const * pOutliner ) { bool bRet=false; if(pOutliner) @@ -1945,7 +1945,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) /* Begin chaining code */ // XXX: Make it a method somewhere? -SdrObject *ImpGetObjByName(SdrObjList *pObjList, OUString const& aObjName) +SdrObject *ImpGetObjByName(SdrObjList const *pObjList, OUString const& aObjName) { // scan the whole list size_t nObjCount = pObjList->GetObjCount(); diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 88d4d09797a1..bf4058831da6 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -112,7 +112,7 @@ struct SdrUnoObjDataHolder namespace { - void lcl_ensureControlVisibility( SdrView* _pView, const SdrUnoObj* _pObject, bool _bVisible ) + void lcl_ensureControlVisibility( SdrView const * _pView, const SdrUnoObj* _pObject, bool _bVisible ) { OSL_PRECOND( _pObject, "lcl_ensureControlVisibility: no object -> no survival!" ); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index b50e0990caa8..9657bf62cf55 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -315,7 +315,7 @@ void SdrObjList::SetRectsDirty() if (pUpList!=nullptr) pUpList->SetRectsDirty(); } -void SdrObjList::impChildInserted(SdrObject& rChild) +void SdrObjList::impChildInserted(SdrObject const & rChild) { sdr::contact::ViewContact* pParent = rChild.GetViewContact().GetParentContact(); @@ -1687,7 +1687,7 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const /** returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value -Color SdrPage::GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay ) const +Color SdrPage::GetPageBackgroundColor( SdrPageView const * pView, bool bScreenDisplay ) const { Color aColor; diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index c099553241e4..e7ced1227be6 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -632,7 +632,7 @@ bool SdrPageView::IsLayer(const OUString& rName, const SdrLayerIDSet& rBS) const return bRet; } -bool SdrPageView::IsObjMarkable(SdrObject* pObj) const +bool SdrPageView::IsObjMarkable(SdrObject const * pObj) const { if (!pObj) return false; @@ -646,7 +646,7 @@ bool SdrPageView::IsObjMarkable(SdrObject* pObj) const { // If object is a Group object, visibility may depend on // multiple layers. If one object is markable, Group is markable. - SdrObjList* pObjList = static_cast<SdrObjGroup*>(pObj)->GetSubList(); + SdrObjList* pObjList = static_cast<SdrObjGroup const *>(pObj)->GetSubList(); if (pObjList && pObjList->GetObjCount()) { diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index 903992975f05..f58f958efa41 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -62,7 +62,7 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject) } -bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const +bool SdrViewIter::ImpCheckPageView(SdrPageView const * pPV) const { if(!mpPage) return true; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index bd3f6aa62f4d..697b85222265 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -825,10 +825,10 @@ void Cell::AddUndo() } -sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell ) +sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextProperties const * pProperties, SdrObject& rNewObj, Cell& rNewCell ) { if( pProperties ) - return new sdr::properties::CellProperties( *static_cast<sdr::properties::CellProperties*>(pProperties), rNewObj, &rNewCell ); + return new sdr::properties::CellProperties( *static_cast<sdr::properties::CellProperties const *>(pProperties), rNewObj, &rNewCell ); else return nullptr; } @@ -987,7 +987,7 @@ sal_Int32 SAL_CALL Cell::getError( ) // XPropertySet -Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) +Any Cell::GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) { Any aAny( SvxItemPropertySet_getPropertyValue( pMap, aSet ) ); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 0d599784335a..1bd063dac3f6 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -67,7 +67,7 @@ public: SVX_DLLPRIVATE void cloneFrom( const CellRef& rCell ); - SVX_DLLPRIVATE void setCellRect( ::tools::Rectangle& rCellRect ) { maCellRect = rCellRect; } + SVX_DLLPRIVATE void setCellRect( ::tools::Rectangle const & rCellRect ) { maCellRect = rCellRect; } SVX_DLLPRIVATE const ::tools::Rectangle& getCellRect() const { return maCellRect; } SVX_DLLPRIVATE ::tools::Rectangle& getCellRect() { return maCellRect; } @@ -179,7 +179,7 @@ public: SVX_DLLPRIVATE sdr::properties::TextProperties* CloneProperties( SdrObject& rNewObj, Cell& rNewCell ); - SVX_DLLPRIVATE static sdr::properties::TextProperties* CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell ); + SVX_DLLPRIVATE static sdr::properties::TextProperties* CloneProperties( sdr::properties::TextProperties const * pProperties, SdrObject& rNewObj, Cell& rNewCell ); SVX_DLLPRIVATE void notifyModified(); @@ -189,7 +189,7 @@ protected: SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override; SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem) override; - SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ); + SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ); private: /// @throws css::uno::RuntimeException diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index e3dae07e78bf..514cd49d593e 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -244,7 +244,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow namespace { -Point pixelToLogic(const Point& rPoint, vcl::Window* pWindow) +Point pixelToLogic(const Point& rPoint, vcl::Window const * pWindow) { if (!pWindow) return rPoint; @@ -891,7 +891,7 @@ namespace } } -void SvxTableController::onFormatTable( SfxRequest& rReq ) +void SvxTableController::onFormatTable( SfxRequest const & rReq ) { sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) @@ -2596,7 +2596,7 @@ bool SvxTableController::PasteObjModel( const SdrModel& rModel ) } -bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj ) +bool SvxTableController::PasteObject( SdrTableObj const * pPasteTableObj ) { if( !pPasteTableObj ) return false; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index ceda77a7fb41..2f0df692c9bf 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -101,7 +101,7 @@ TableRow& TableRow::operator=( const TableRow& r ) } -void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter /* = 0 */ ) +void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator const * pIter /* = 0 */ ) { throwIfDisposed(); if( nCount ) diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 7242ae138751..57c836d64548 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -46,7 +46,7 @@ public: TableRow& operator=( const TableRow& ); - void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter ); + void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator const * pIter ); void removeColumns( sal_Int32 nIndex, sal_Int32 nCount ); /// Reference to the table model containing this row. const TableModelRef& getModel() const; diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index d1800721fdf4..61aa8c405bc9 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -91,7 +91,7 @@ public: void NextColumn(); void NewCellRow(); - void InsertCell( RtfImportInfo* pInfo ); + void InsertCell( RtfImportInfo const * pInfo ); void InsertColumnEdge( sal_Int32 nEdge ); void FillTable(); @@ -212,7 +212,7 @@ void SdrTableRTFParser::NextRow() ++mnRowCnt; } -void SdrTableRTFParser::InsertCell( RtfImportInfo* pInfo ) +void SdrTableRTFParser::InsertCell( RtfImportInfo const * pInfo ) { RTFCellInfoPtr xCellInfo( new RTFCellInfo(mrItemPool) ); diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index d9dcda7c749b..03d4258ae2e8 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -30,7 +30,7 @@ class NumberingPopup : public svtools::ToolbarMenu VclPtr<SvxNumValueSet> mpValueSet; DECL_LINK( VSSelectToolbarMenuHdl, ToolbarMenu*, void ); DECL_LINK( VSSelectValueSetHdl, ValueSet*, void ); - void VSSelectHdl(void *); + void VSSelectHdl(void const *); public: NumberingPopup( NumberingToolBoxControl& rController, vcl::Window* pParent, NumberingPageType ePageType ); @@ -157,7 +157,7 @@ IMPL_LINK( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void VSSelectHdl(pControl); } -void NumberingPopup::VSSelectHdl(void* pControl) +void NumberingPopup::VSSelectHdl(void const * pControl) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 5f74831edcfe..f65b24a25a3c 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -262,7 +262,7 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectToolbarMenuHdl, ToolbarMenu*, pContro { SelectHdl(pControl); } -void ExtrusionDirectionWindow::SelectHdl(void* pControl) +void ExtrusionDirectionWindow::SelectHdl(void const * pControl) { if ( IsInPopupMode() ) EndPopupMode(); @@ -761,7 +761,7 @@ IMPL_LINK( ExtrusionLightingWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl { SelectHdl(pControl); } -void ExtrusionLightingWindow::SelectHdl(void* pControl) +void ExtrusionLightingWindow::SelectHdl(void const * pControl) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 1b40c2d649af..d479b50279c9 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -76,7 +76,7 @@ private: DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); DECL_LINK( SelectValueSetHdl, ValueSet*, void ); - void SelectHdl(void*); + void SelectHdl(void const *); void implSetDirection( sal_Int32 nSkew, bool bEnabled ); void implSetProjection( sal_Int32 nProjection, bool bEnabled ); @@ -170,7 +170,7 @@ private: DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); DECL_LINK( SelectValueSetHdl, ValueSet*, void ); - void SelectHdl(void*); + void SelectHdl(void const *); public: ExtrusionLightingWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ); virtual ~ExtrusionLightingWindow() override; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 12a822e4b858..3a14314e5066 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -827,7 +827,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) } } -void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) +void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView const & rView ) { SfxItemPool& rPool = rView.GetModel()->GetItemPool(); SfxItemSet aAttrSet( rPool ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index f154bf291566..0050682096f3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1392,7 +1392,7 @@ void SvxColorWindow::KeyInput( const KeyEvent& rKEvt ) mpColorSet->KeyInput(rKEvt); } -NamedColor SvxColorWindow::GetSelectEntryColor(ValueSet* pColorSet) +NamedColor SvxColorWindow::GetSelectEntryColor(ValueSet const * pColorSet) { Color aColor = pColorSet->GetItemColor(pColorSet->GetSelectItemId()); OUString sColorName = pColorSet->GetItemText(pColorSet->GetSelectItemId()); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 2498b7347d4c..92aa0e7aba11 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -111,7 +111,7 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const *pLighting2Defaults = aLighting2Defaults; }; -static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) +static void impl_execute( SdrView*, SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { static const char sExtrusion[] = "Extrusion"; static const char sRotateAngle[] = "RotateAngle"; @@ -449,7 +449,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem } } -void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ) +void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings ) { sal_uInt16 nSID = rReq.GetSlot(); const char* pStrResId = nullptr; @@ -608,7 +608,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB } } -void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -755,7 +755,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_DIRECTION ); } -void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -810,7 +810,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_PROJECTION ); } -void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -895,7 +895,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_SURFACE ); } -void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -974,7 +974,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 ) return false; } -void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -1053,7 +1053,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_LIGHTING_DIRECTION ); } -void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -1120,7 +1120,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_LIGHTING_INTENSITY ); } -void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) +void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -1192,7 +1192,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) } namespace svx { -bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) +bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded ) { static const char sExtrusion[] = "Extrusion"; @@ -1223,7 +1223,7 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) } } -void ExtrusionBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) +void ExtrusionBar::getState( SdrView const * pSdrView, SfxItemSet& rSet ) { if (rSet.GetItemState(SID_EXTRUSION_DIRECTION) != SfxItemState::UNKNOWN) { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 67d3daf5a11f..8fffcccf549e 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) +void SetAlignmentState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -89,7 +89,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.Put( SfxInt32Item( SID_FONTWORK_ALIGNMENT, nAlignment ) ); } -void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) +void SetCharacterSpacingState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -114,7 +114,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) } -void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) +void SetKernCharacterPairsState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -133,7 +133,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_FONTWORK_KERN_CHARACTER_PAIRS, bChecked ) ); } -void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) +void SetFontWorkShapeTypeState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -198,7 +198,7 @@ FontworkBar::~FontworkBar() SetRepeatTarget(nullptr); } -static vcl::Window* ImpGetViewWin(SdrView* pView) +static vcl::Window* ImpGetViewWin(SdrView const * pView) { if( pView ) { @@ -218,7 +218,7 @@ static vcl::Window* ImpGetViewWin(SdrView* pView) } namespace svx { -bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) +bool checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus ) { if ( nCheckStatus & 2 ) return ( nCheckStatus & 1 ) != 0; @@ -246,7 +246,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) } } -static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) +static void impl_execute( SdrView*, SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -415,7 +415,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const } -void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ) +void FontworkBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings ) { const char* pStrResId = nullptr; @@ -546,7 +546,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi }; } -void FontworkBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) +void FontworkBar::getState( SdrView const * pSdrView, SfxItemSet& rSet ) { sal_uInt32 nCheckStatus = 0; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 7b1900f49c42..3621d7f0938c 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -382,7 +382,7 @@ void DictionaryList::Resize() void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& xDictionary, vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property, - vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property) + vcl::Window const *pFT_Term, vcl::Window const *pFT_Mapping, vcl::Window const *pFT_Property) { SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SelectionMode::Single ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 3effd13b58b6..6b4a9e864d53 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -60,7 +60,7 @@ public: void init(const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary, vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property, - vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property); + vcl::Window const *pFT_Term, vcl::Window const *pFT_Mapping, vcl::Window const *pFT_Property); void deleteAll(); void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ ); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 316fd6f771bb..1bb12319bdd3 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -269,7 +269,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const throw container::NoSuchElementException(); } -static bool getByNameFromPool( const OUString& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny ) +static bool getByNameFromPool( const OUString& rSearchName, SfxItemPool const * pPool, sal_uInt16 nWhich, uno::Any& rAny ) { const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0; for( sal_uInt32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) @@ -313,7 +313,7 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) return aAny; } -static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString >& rNameSet ) +static void createNamesForPool( SfxItemPool const * pPool, sal_uInt16 nWhich, std::set< OUString >& rNameSet ) { const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich ); diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 3216d30ed14d..7d7b81c58cb1 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -91,7 +91,7 @@ SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw() } } -void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, uno::Any& rValue ) +void SvxUnoDrawPool::getAny( SfxItemPool const * pPool, const comphelper::PropertyMapEntry* pEntry, uno::Any& rValue ) { switch( pEntry->mnHandle ) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index ddbfb8b9e992..293b77c1a2bc 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -255,7 +255,7 @@ static bool ConvertHomogenMatrixToObject( E3dObject* pObject, const Any& rValue return false; } -static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue ) +static void ConvertObjectToHomogenMatric( E3dObject const * pObject, Any& rValue ) { drawing::HomogenMatrix aHomMat; const basegfx::B3DHomMatrix& rMat = pObject->GetTransform(); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index a14e539878b2..49dbba665cd4 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1063,7 +1063,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() // Prefixing with 'svx' and marking static to make sure name collisions // do not occur. -static bool svx_needLogicRectHack( SdrObject* pObj ) +static bool svx_needLogicRectHack( SdrObject const * pObj ) { if( pObj->GetObjInventor() == SdrInventor::Default) { @@ -1090,7 +1090,7 @@ static bool svx_needLogicRectHack( SdrObject* pObj ) } -static tools::Rectangle svx_getLogicRectHack( SdrObject* pObj ) +static tools::Rectangle svx_getLogicRectHack( SdrObject const * pObj ) { if(svx_needLogicRectHack(pObj)) { @@ -1413,7 +1413,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName } -bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) +bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel ) { // check if an item with the given name and which id is inside the models // pool or the stylesheet pool, if found it's put in the itemset @@ -1881,7 +1881,7 @@ void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUS } -uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const +uno::Any SvxShape::GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const { DBG_TESTSOLARMUTEX(); uno::Any aAny; diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 29d658e00065..4b23a33e025f 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -333,7 +333,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) } -void GalleryTheme::implReleaseItems( GalleryObject* pObj ) +void GalleryTheme::implReleaseItems( GalleryObject const * pObj ) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index a8f78d6aafab..1b334411e99f 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -87,7 +87,7 @@ private: ::GalleryTheme* implGetTheme() const { return mpTheme;} - void implReleaseItems( GalleryObject* pObj ); + void implReleaseItems( GalleryObject const * pObj ); void implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ); void implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem ); diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 47f2077197c3..c746ae84d25a 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::io; namespace { -const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) +const MetaCommentAction* ImplCheckForEPS( GDIMetaFile const & rMtf ) { const MetaCommentAction* pComment = nullptr; @@ -622,7 +622,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, return bRet; } -void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString& rRequestedFileName ) +void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString const & rRequestedFileName ) { OUString aPictureStorageName, aPictureStreamName; if( ( maURLSet.find( rURLStr ) != maURLSet.end() ) ) diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 27786a816da9..3fca3c3782b7 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1158,8 +1158,7 @@ bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const if ( IsFrameSelected() || !Imp()->HasDrawView() ) return false; else - return Imp()->GetDrawView() - ->IsObjMarked( const_cast< SdrObject * >( &rObj ) ); + return Imp()->GetDrawView()->IsObjMarked( &rObj ); } bool SwFEShell::IsObjSameLevelWithMarked(const SdrObject* pObj) const @@ -1425,7 +1424,7 @@ namespace virtual bool includeObject( const SdrObject& i_rObject ) const override { - return m_pPV && m_pPV->GetView().IsObjMarkable( const_cast< SdrObject* >( &i_rObject ), m_pPV ); + return m_pPV && m_pPV->GetView().IsObjMarkable( &i_rObject, m_pPV ); } private: diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index d3575cbc1547..bfe720085d27 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1378,15 +1378,12 @@ SelectionType SwWrtShell::GetSelectionType() const else if( GetDrawView()->GetContext() == SdrViewContext::Media ) nCnt |= SelectionType::Media; - if (svx::checkForSelectedCustomShapes( - const_cast<SdrView *>(GetDrawView()), - true /* bOnlyExtruded */ )) + if (svx::checkForSelectedCustomShapes( GetDrawView(), true /* bOnlyExtruded */ )) { nCnt |= SelectionType::ExtrudedCustomShape; } sal_uInt32 nCheckStatus = 0; - if (svx::checkForSelectedFontWork( - const_cast<SdrView *>(GetDrawView()), nCheckStatus )) + if (svx::checkForSelectedFontWork( GetDrawView(), nCheckStatus )) { nCnt |= SelectionType::FontWork; } |