loplugin:constparams in svx

and fix a bug in the plugin itself when calling operator's like the one
on std::function<>

Change-Id: I1617607107eeff06785c1841f69e13ad2926218e
Reviewed-on: https://gerrit.libreoffice.org/40446
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-07-26 14:11:32 +02:00
parent 781a30e938
commit 8ce64dbb3d
137 changed files with 370 additions and 371 deletions

View File

@ -111,6 +111,9 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl * functionDecl)
|| name == "my_if_errors" || name == "my_if_errors"
|| name == "my_eval_defined" || name == "my_eval_defined"
|| name == "my_eval_variable" || name == "my_eval_variable"
|| name == "ImpGetEscDir"
|| name == "ImpGetPercent"
|| name == "ImpGetAlign"
// #ifdef win32 // #ifdef win32
|| name == "convert_slashes" || name == "convert_slashes"
// UNO component entry points // UNO component entry points
@ -268,8 +271,9 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
if (operatorCallExpr->getArg(0) == stmt) { if (operatorCallExpr->getArg(0) == stmt) {
return calleeMethodDecl->isConst(); return calleeMethodDecl->isConst();
} }
if (operatorCallExpr->getArg(1) == stmt) { for (unsigned i = 1; i < operatorCallExpr->getNumArgs(); ++i)
return isPointerOrReferenceToConst(calleeMethodDecl->getParamDecl(0)->getType()); if (operatorCallExpr->getArg(i) == stmt) {
return isPointerOrReferenceToConst(calleeMethodDecl->getParamDecl(i - 1)->getType());
} }
} else { } else {
const Expr* callee = operatorCallExpr->getCallee()->IgnoreParenImpCasts(); const Expr* callee = operatorCallExpr->getCallee()->IgnoreParenImpCasts();

View File

@ -177,7 +177,7 @@ public:
@param rShapeTreeInfo @param rShapeTreeInfo
The new info that replaces the current one. 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 /** Update the SELECTED and FOCUSED states of all visible children
according to the given selection. This includes setting according to the given selection. This includes setting

View File

@ -74,7 +74,7 @@ private:
DECL_LINK( OpenPickerClickHdl, Button*, void ); DECL_LINK( OpenPickerClickHdl, Button*, void );
static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor); static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor);
static NamedColor GetSelectEntryColor(ValueSet* pColorSet); static NamedColor GetSelectEntryColor(ValueSet const * pColorSet);
NamedColor GetAutoColor() const; NamedColor GetAutoColor() const;
public: public:

View File

@ -304,7 +304,7 @@ protected:
void InitSettings(bool bForeground, bool bBackground); void InitSettings(bool bForeground, bool bBackground);
// prepare buffered paint // prepare buffered paint
void LocalPrePaint(vcl::RenderContext& rRenderContext); void LocalPrePaint(vcl::RenderContext const & rRenderContext);
// end and output buffered paint // end and output buffered paint
void LocalPostPaint(vcl::RenderContext& rRenderContext); void LocalPostPaint(vcl::RenderContext& rRenderContext);

View File

@ -41,7 +41,7 @@ private:
protected: protected:
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
void SetDefaultAttributes(E3dDefaultAttributes& rDefault); void SetDefaultAttributes(E3dDefaultAttributes const & rDefault);
public: public:

View File

@ -33,7 +33,7 @@ class SdrView;
namespace svx 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 class SAL_WARN_UNUSED SVX_DLLPUBLIC ExtrusionBar : public SfxShell
{ {
@ -48,8 +48,8 @@ public:
ExtrusionBar(SfxViewShell* pViewShell); ExtrusionBar(SfxViewShell* pViewShell);
virtual ~ExtrusionBar() override; virtual ~ExtrusionBar() override;
static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); static void execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings );
static void getState( SdrView* pSdrView, SfxItemSet& rSet ); static void getState( SdrView const * pSdrView, SfxItemSet& rSet );
}; };
} }

View File

@ -220,7 +220,7 @@ public:
void InitColorLB(); void InitColorLB();
bool IsUpdateMode() const { return bUpdate; } bool IsUpdateMode() const { return bUpdate; }
void Update( SfxItemSet& rSet ); void Update( SfxItemSet const & rSet );
void GetAttr( SfxItemSet& rSet ); void GetAttr( SfxItemSet& rSet );
void UpdatePreview(); // upward (private) void UpdatePreview(); // upward (private)

View File

@ -191,7 +191,7 @@ protected:
@return @return
<TRUE/> if the column is selected, otherwise <FALSE/> <TRUE/> if the column is selected, otherwise <FALSE/>
*/ */
bool isColumnSelected(DbGridColumn* _pColumn); bool isColumnSelected(DbGridColumn const * _pColumn);
}; };
#endif // INCLUDED_SVX_FMGRIDCL_HXX #endif // INCLUDED_SVX_FMGRIDCL_HXX

View File

@ -473,8 +473,8 @@ public:
virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override; 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; virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override;
void columnVisible(DbGridColumn* pColumn); void columnVisible(DbGridColumn const * pColumn);
void columnHidden(DbGridColumn* pColumn); void columnHidden(DbGridColumn const * pColumn);
// css::awt::XView // css::awt::XView
virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) override; virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) override;

View File

@ -71,7 +71,7 @@ public:
void SetName( const OUString& rName ) { m_sPageName = rName; } void SetName( const OUString& rName ) { m_sPageName = rName; }
static bool RequestHelp( static bool RequestHelp(
vcl::Window* pWin, vcl::Window* pWin,
SdrView* pView, SdrView const * pView,
const HelpEvent& rEvt ); const HelpEvent& rEvt );
protected: protected:

View File

@ -86,7 +86,7 @@ public:
virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) override; virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) override;
static void createControlLabelPair( static void createControlLabelPair(
OutputDevice* _pOutDev, OutputDevice const * _pOutDev,
sal_Int32 _nXOffsetMM, sal_Int32 _nXOffsetMM,
sal_Int32 _nYOffsetMM, sal_Int32 _nYOffsetMM,
const css::uno::Reference< css::beans::XPropertySet >& _rxField, const css::uno::Reference< css::beans::XPropertySet >& _rxField,
@ -122,8 +122,8 @@ public:
/// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL"
FmFormPage* GetCurPage(); FmFormPage* GetCurPage();
SVX_DLLPRIVATE void ActivateControls(SdrPageView*); SVX_DLLPRIVATE void ActivateControls(SdrPageView const *);
SVX_DLLPRIVATE void DeactivateControls(SdrPageView*); SVX_DLLPRIVATE void DeactivateControls(SdrPageView const *);
SVX_DLLPRIVATE void ChangeDesignMode(bool bDesign); SVX_DLLPRIVATE void ChangeDesignMode(bool bDesign);

View File

@ -33,7 +33,7 @@ class SdrView;
namespace svx 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 class SAL_WARN_UNUSED SVX_DLLPUBLIC FontworkBar : public SfxShell
{ {
@ -48,8 +48,8 @@ public:
FontworkBar(SfxViewShell* pViewShell); FontworkBar(SfxViewShell* pViewShell);
virtual ~FontworkBar() override; virtual ~FontworkBar() override;
static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); static void execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings );
static void getState( SdrView* pSdrView, SfxItemSet& rSet ); static void getState( SdrView const * pSdrView, SfxItemSet& rSet );
}; };
} }

View File

@ -107,7 +107,7 @@ private:
GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName );
SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme* pTheme ); SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme const * pTheme );
Gallery( const OUString& rMultiPath ); Gallery( const OUString& rMultiPath );
virtual ~Gallery() override; virtual ~Gallery() override;

View File

@ -189,7 +189,7 @@ public:
bool GetModel( sal_uIntPtr nPos, SdrModel& rModel ); bool GetModel( sal_uIntPtr nPos, SdrModel& rModel );
bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos ); 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 InsertModelStream( const tools::SvRef<SotStorageStream>& rModelStream, sal_uIntPtr nInsertPos );
SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL ); SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL );

View File

@ -114,7 +114,7 @@ class SVX_DLLPUBLIC SvxGrafAttrHelper
public: public:
static void ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ); 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 #endif // INCLUDED_SVX_GRAFCTRL_HXX

View File

@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter
{ {
public: public:
static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); static sal_uLong ExecuteGrfFilterSlot( SfxRequest const & rReq, GraphicObject& rFilterObject );
static void DisableGraphicFilterSlots( SfxItemSet& rSet ); static void DisableGraphicFilterSlots( SfxItemSet& rSet );
}; };

View File

@ -560,7 +560,7 @@ protected:
sal_Int32 AlignSeekCursor(); sal_Int32 AlignSeekCursor();
bool SetCurrent(long nNewRow); bool SetCurrent(long nNewRow);
OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const; OUString GetCurrentRowCellText(DbGridColumn const * pCol,const DbGridRowRef& _rRow) const;
virtual void DeleteSelectedRows(); virtual void DeleteSelectedRows();
static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.is() && _xRow->IsValid(); } static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.is() && _xRow->IsValid(); }

View File

@ -41,7 +41,7 @@ private:
protected: protected:
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
void SetDefaultAttributes(E3dDefaultAttributes& rDefault); void SetDefaultAttributes(E3dDefaultAttributes const & rDefault);
public: public:
E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D); E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D);

View File

@ -83,13 +83,13 @@ public:
void SetNumberingSettings( void SetNumberingSettings(
const css::uno::Sequence< const css::uno::Sequence<
css::uno::Sequence<css::beans::PropertyValue> >& aNum, 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 ); const css::lang::Locale& rLocale );
void SetOutlineNumberingSettings( void SetOutlineNumberingSettings(
css::uno::Sequence< css::uno::Sequence<
css::uno::Reference<css::container::XIndexAccess> >& rOutline, css::uno::Reference<css::container::XIndexAccess> > const & rOutline,
css::uno::Reference<css::text::XNumberingFormatter>& xFormatter, css::uno::Reference<css::text::XNumberingFormatter> const & xFormatter,
const css::lang::Locale& rLocale); const css::lang::Locale& rLocale);
}; };

View File

@ -160,7 +160,7 @@ public:
// Insert 3D object into the group; transfer to other owner! // Insert 3D object into the group; transfer to other owner!
void Insert3DObj(E3dObject* p3DObj); void Insert3DObj(E3dObject* p3DObj);
void Remove3DObj(E3dObject* p3DObj); void Remove3DObj(E3dObject const * p3DObj);
E3dObject* GetParentObj() const; E3dObject* GetParentObj() const;
virtual E3dScene* GetScene() const; virtual E3dScene* GetScene() const;

View File

@ -72,8 +72,8 @@ public:
: Edit(pParent, WB_BORDER) : Edit(pParent, WB_BORDER)
{ {
} }
void SetScrollHdl(Link<sal_Int32,bool>& rLink) {aScrollHdl = rLink;} void SetScrollHdl(Link<sal_Int32,bool> const & rLink) {aScrollHdl = rLink;}
void SetJumpHdl(Link<sal_Int32,void>& rLink) {aJumpHdl = rLink;} void SetJumpHdl(Link<sal_Int32,void> const & rLink) {aJumpHdl = rLink;}
}; };

View File

@ -69,7 +69,7 @@ public:
SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr ); SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr );
SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId ); SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId );
SVX_DLLPRIVATE void onSelect( 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 MergeMarkedCells();
SVX_DLLPRIVATE void SplitMarkedCells(); SVX_DLLPRIVATE void SplitMarkedCells();
SVX_DLLPRIVATE void DistributeColumns(); SVX_DLLPRIVATE void DistributeColumns();
@ -135,7 +135,7 @@ private:
SVX_DLLPRIVATE void SetTableStyle( const SfxItemSet* pArgs ); SVX_DLLPRIVATE void SetTableStyle( const SfxItemSet* pArgs );
SVX_DLLPRIVATE void SetTableStyleSettings( 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 bool checkTableObject();
SVX_DLLPRIVATE const CellPos& getSelectionStart(); SVX_DLLPRIVATE const CellPos& getSelectionStart();

View File

@ -41,7 +41,7 @@ namespace sdr
/// paint the transparent children of rWin that overlap rPixelRect /// paint the transparent children of rWin that overlap rPixelRect
/// (for example, transparent form controls like check boxes) /// (for example, transparent form controls like check boxes)
void SVX_DLLPUBLIC void SVX_DLLPUBLIC
PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect); PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect);
class SdrPreRenderDevice class SdrPreRenderDevice
{ {

View File

@ -46,7 +46,7 @@ private:
VclPtr<MetricField> maMtrTrgrEndValue; VclPtr<MetricField> maMtrTrgrEndValue;
VclPtr<MetricField> maMtrTrgrBorder; VclPtr<MetricField> maMtrTrgrBorder;
void InitStatus(XFillFloatTransparenceItem* pGradientItem); void InitStatus(XFillFloatTransparenceItem const * pGradientItem);
void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol); void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol);
DECL_LINK(ModifiedTrgrHdl_Impl, Edit&, void); DECL_LINK(ModifiedTrgrHdl_Impl, Edit&, void);
DECL_LINK(Left_Click45_Impl, ToolBox*, void); DECL_LINK(Left_Click45_Impl, ToolBox*, void);
@ -54,7 +54,7 @@ private:
public: public:
AreaTransparencyGradientPopup(AreaPropertyPanelBase& rPanel); AreaTransparencyGradientPopup(AreaPropertyPanelBase& rPanel);
virtual ~AreaTransparencyGradientPopup() override; virtual ~AreaTransparencyGradientPopup() override;
void Rearrange (XFillFloatTransparenceItem* pItem); void Rearrange (XFillFloatTransparenceItem const * pItem);
virtual void dispose() override; virtual void dispose() override;
}; };

View File

@ -246,7 +246,7 @@ private:
DECL_LINK(NoFormatHdl_Impl, Button*, void); DECL_LINK(NoFormatHdl_Impl, Button*, void);
DECL_LINK(AttributeHdl_Impl, Button*, void); DECL_LINK(AttributeHdl_Impl, Button*, void);
DECL_LINK( TimeoutHdl_Impl, Timer*, void ); DECL_LINK( TimeoutHdl_Impl, Timer*, void );
void ClickHdl_Impl(void* pCtrl); void ClickHdl_Impl(void const * pCtrl);
void Construct_Impl(); void Construct_Impl();
void InitControls_Impl(); void InitControls_Impl();
@ -260,7 +260,7 @@ private:
void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ); void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool );
void EnableControls_Impl( const SearchOptionFlags nFlags ); void EnableControls_Impl( const SearchOptionFlags nFlags );
void EnableControl_Impl( Control* pCtrl ); void EnableControl_Impl( Control const * pCtrl );
void SetItem_Impl( const SvxSearchItem* pItem ); void SetItem_Impl( const SvxSearchItem* pItem );
void SetModifyFlag_Impl( const Control* pCtrl ); void SetModifyFlag_Impl( const Control* pCtrl );

View File

@ -149,7 +149,7 @@ protected:
static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
bool bVertical, bool bNoContortion, bool bRotate, const tools::Rectangle& rMarkRect); bool bVertical, bool bNoContortion, bool bRotate, const tools::Rectangle& rMarkRect);
static void ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); 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); void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
// Removes all objects of the MarkList from their ObjLists including Undo. // Removes all objects of the MarkList from their ObjLists including Undo.

View File

@ -106,13 +106,13 @@ protected:
TextChainCursorManager *ImpHandleMotionThroughBoxesKeyInput(const KeyEvent& rKEvt, bool *bOutHandled); 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. // Create a new OutlinerView at the heap and initialize all required parameters.
// pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized // pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized
OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const; OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const;
void ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect, OutputDevice& rTargetDevice) const; void ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect, OutputDevice& rTargetDevice) const;
void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; void ImpInvalidateOutlinerView(OutlinerView const & rOutlView) const;
// Chaining // Chaining
void ImpChainingEventHdl(); void ImpChainingEventHdl();
@ -273,7 +273,7 @@ public:
void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats );
/** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */ /** 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: protected:
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ); virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo );

View File

@ -217,8 +217,8 @@ public:
} }
// pPage=0L: Selection of everything! Respect Pages // pPage=0L: Selection of everything! Respect Pages
bool TakeBoundRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; bool TakeBoundRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const;
bool TakeSnapRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; bool TakeSnapRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const;
// All Entries are copied! // All Entries are copied!
SdrMarkList& operator=(const SdrMarkList& rLst); SdrMarkList& operator=(const SdrMarkList& rLst);

View File

@ -266,7 +266,7 @@ public:
css::uno::Reference< css::uno::Reference<
css::io::XInputStream > css::io::XInputStream >
GetDocumentStream(OUString const& rURL, GetDocumentStream(OUString const& rURL,
::comphelper::LifecycleProxy & rProxy) const; ::comphelper::LifecycleProxy const & rProxy) const;
// Change the template attributes of the symbol objects to hard attributes // Change the template attributes of the symbol objects to hard attributes
void BurnInStyleSheetAttributes(); void BurnInStyleSheetAttributes();
// If you inherit from SdrPage you also need to inherit from SdrModel // If you inherit from SdrPage you also need to inherit from SdrModel

View File

@ -153,8 +153,8 @@ protected:
void ForceUndirtyMrkPnt() const { if (mbMrkPntDirty) UndirtyMrkPnt(); } 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; 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 const * 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 SdrMarkList * pMarkList) const;
bool ImpIsFrameHandles() const; bool ImpIsFrameHandles() const;
void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const; void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const;
@ -180,7 +180,7 @@ public:
virtual void ClearPageView() override; virtual void ClearPageView() override;
virtual void HideSdrPage() 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 // Returns sal_True if objects, points or glue points are selected by drawing a frame
// (as long as the frame is drawn). // (as long as the frame is drawn).
@ -292,12 +292,11 @@ public:
void MarkObj(const tools::Rectangle& rRect, bool bUnmark); void MarkObj(const tools::Rectangle& rRect, bool bUnmark);
void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false);
void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages 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. // This function is time-consuming intensive, as the MarkList has to be scanned.
bool IsObjMarked(SdrObject* pObj) const; bool IsObjMarked(SdrObject const * pObj) const;
// void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline void UnMarkAll(SdrPageView const * pPV=nullptr) { UnmarkAllObj(pPV); }
void UnMarkAll(SdrPageView* pPV=nullptr) { UnmarkAllObj(pPV); }
// Request/set the size of the marking handles. Declaration in Pixel. // Request/set the size of the marking handles. Declaration in Pixel.
// The value is meant to be the edge length ( link length ). // 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, // Search for the number of the suitable handle. In case of empty search result,
// SAL_MAX_SIZE is returned. // 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); } SdrHdl* GetHdl(size_t nHdlNum) const { return maHdlList.GetHdl(nHdlNum); }
const SdrHdlList& GetHdlList() const { return maHdlList; } const SdrHdlList& GetHdlList() const { return maHdlList; }

View File

@ -66,10 +66,10 @@ private:
private: private:
SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const; 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 ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect);
SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& 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& 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& rRect); SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect);
SVX_DLLPRIVATE void ImpRecalcTail(); SVX_DLLPRIVATE void ImpRecalcTail();
public: public:

View File

@ -180,7 +180,7 @@ protected:
const Point& rPt2, long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, const Point& rPt2, long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2,
sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const;
static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr); 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 ImpSetTailPoint(bool bTail1, const Point& rPt);
void ImpUndirtyEdgeTrack(); // potential recalculation of the connection track void ImpUndirtyEdgeTrack(); // potential recalculation of the connection track
void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time

View File

@ -87,7 +87,7 @@ public:
// The original size of the object (size of the icon for iconified object) // The original size of the object (size of the icon for iconified object)
// no conversion is done if no target mode is provided // 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 // #i118524# Allow suppress SetVisAreaSize in changing methods when call
// comes from OLE client // comes from OLE client

View File

@ -607,7 +607,7 @@ public:
or if the given SdrOutliner contains no text. or if the given SdrOutliner contains no text.
Also checks for one empty paragraph. Also checks for one empty paragraph.
*/ */
static bool HasTextImpl( SdrOutliner* pOutliner ); static bool HasTextImpl( SdrOutliner const * pOutliner );
friend class ::SdrTextObjTest; friend class ::SdrTextObjTest;
}; };

View File

@ -83,7 +83,7 @@ protected:
private: private:
/// simple ActionChildInserted forwarder to have it on a central place /// simple ActionChildInserted forwarder to have it on a central place
static void impChildInserted(SdrObject& rChild); static void impChildInserted(SdrObject const & rChild);
public: public:
SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage); SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage);
virtual ~SdrObjList(); virtual ~SdrObjList();
@ -498,7 +498,7 @@ public:
/** *deprecated* returns an averaged background color of this page */ /** *deprecated* returns an averaged background color of this page */
// #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value // #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 /** this method returns true if the object from the ViewObjectContact should
be visible on this page while rendering. be visible on this page while rendering.

View File

@ -228,7 +228,7 @@ public:
/// it must not be locked /// it must not be locked
/// @returns /// @returns
/// true, if the object's layer is visible and not locked /// 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 /// Entering (editing) an object group
/// After that, we have direct access to all member objects of the group. /// After that, we have direct access to all member objects of the group.

View File

@ -75,7 +75,7 @@ class SVX_DLLPUBLIC SdrViewIter
private: private:
SVX_DLLPRIVATE void ImpInitVars(); SVX_DLLPRIVATE void ImpInitVars();
SVX_DLLPRIVATE SdrView* ImpFindView(); SVX_DLLPRIVATE SdrView* ImpFindView();
SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView* pPV) const; SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView const * pPV) const;
public: public:
SdrViewIter(const SdrPage* pPage); SdrViewIter(const SdrPage* pPage);

View File

@ -79,7 +79,7 @@ protected:
void init(); void init();
/// @throws css::beans::UnknownPropertyException /// @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::beans::UnknownPropertyException
/// @throws css::lang::IllegalArgumentException /// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException

View File

@ -146,7 +146,7 @@ protected:
void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw();
void ForceMetricTo100th_mm(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 ); bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName );
@ -216,7 +216,7 @@ public:
sal_uInt32 getShapeKind() const; sal_uInt32 getShapeKind() const;
// styles need this // 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 ); static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
/** same as SetFillAttribute but for property names instead of which ids, /** same as SetFillAttribute but for property names instead of which ids,

View File

@ -53,13 +53,13 @@ protected:
void InitView(); void InitView();
void ImpCreate3DObject(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& rLatheMat); void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat);
void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj); void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj);
void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj); void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj);
void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ); 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); void BreakSingle3DObj(E3dObject* pObj);
public: public:
@ -87,13 +87,13 @@ public:
const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) override; const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) override;
// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) // #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; 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)); 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. // 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(); void ConvertMarkedToPolyObj();
E3dScene* SetCurrent3DObj(E3dObject* p3DObj); E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation(); void Start3DCreation();

View File

@ -78,7 +78,7 @@ private:
const OUString& rPictureStreamName, const OUString& rPictureStreamName,
const OUString& rGraphicId, const OUString& rGraphicId,
bool bUseGfxLink ); 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: protected:
SvXMLGraphicHelper(); SvXMLGraphicHelper();

View File

@ -132,7 +132,7 @@ void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const SdrObject* pObj = pSdrHint->GetObject(); const SdrObject* pObj = pSdrHint->GetObject();
const SdrHintKind eKind = pSdrHint->GetKind(); const SdrHintKind eKind = pSdrHint->GetKind();
// check for change of selected object // check for change of selected object
if(SdrHintKind::ObjectChange == eKind && pObj && IsObjMarked(const_cast<SdrObject*>(pObj))) if(SdrHintKind::ObjectChange == eKind && pObj && IsObjMarked(pObj))
AdjustMarkHdl(); AdjustMarkHdl();
else if ( eKind == SdrHintKind::ObjectRemoved ) else if ( eKind == SdrHintKind::ObjectRemoved )
ObjectRemovedInAliveMode(pObj); ObjectRemovedInAliveMode(pObj);

View File

@ -48,7 +48,7 @@ namespace sdr
void impPrepareGraphicWithAsynchroniousLoading(); void impPrepareGraphicWithAsynchroniousLoading();
void impPrepareGraphicWithSynchroniousLoading(); void impPrepareGraphicWithSynchroniousLoading();
void doAsynchGraphicLoading(); void doAsynchGraphicLoading();
void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent* pEvent); void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent const * pEvent);
protected: protected:
const SdrGrafObj& getSdrGrafObj() const; const SdrGrafObj& getSdrGrafObj() const;

View File

@ -97,7 +97,7 @@ class SdrItemBrowser: public FloatingWindow {
Idle aIdle; Idle aIdle;
SdrView* pView; SdrView* pView;
bool bDirty; bool bDirty;
static vcl::Window* ImpGetViewWin(SdrView& rView); static vcl::Window* ImpGetViewWin(SdrView const & rView);
DECL_LINK(IdleHdl, Timer *, void); DECL_LINK(IdleHdl, Timer *, void);
DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void); DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void);
DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void); DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void);

View File

@ -89,7 +89,7 @@ void ChildrenManager::ClearAccessibleShapeList()
mpImpl->ClearAccessibleShapeList (); mpImpl->ClearAccessibleShapeList ();
} }
void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo) void ChildrenManager::SetInfo (AccessibleShapeTreeInfo const & rShapeTreeInfo)
{ {
mpImpl->SetInfo (rShapeTreeInfo); mpImpl->SetInfo (rShapeTreeInfo);
} }

View File

@ -241,7 +241,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom
return pRenderedShape; return pRenderedShape;
} }
void SetTemporary( uno::Reference< drawing::XShape >& xShape ) void SetTemporary( uno::Reference< drawing::XShape > const & xShape )
{ {
if ( xShape.is() ) if ( xShape.is() )
{ {

View File

@ -1498,7 +1498,7 @@ void SvxPreviewBase::dispose()
Control::dispose(); Control::dispose();
} }
void SvxPreviewBase::LocalPrePaint(vcl::RenderContext& rRenderContext) void SvxPreviewBase::LocalPrePaint(vcl::RenderContext const & rRenderContext)
{ {
// init BufferDevice // init BufferDevice
if (mpBufferDevice->GetOutputSizePixel() != GetOutputSizePixel()) if (mpBufferDevice->GetOutputSizePixel() != GetOutputSizePixel())

View File

@ -84,7 +84,7 @@ using ::com::sun::star::i18n::BreakIterator;
namespace 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); rFont.SetAverageFontWidth(0);
n100PercentFont = rRenderContext.GetFontMetric(rFont).GetAverageFontWidth(); n100PercentFont = rRenderContext.GetFontMetric(rFont).GetAverageFontWidth();
@ -195,13 +195,13 @@ public:
} }
void CheckScript(); 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); void DrawPrev(vcl::RenderContext& rRenderContext, Printer* pPrinter, Point& rPt, const SvxFont& rFont);
bool SetFontWidthScale(sal_uInt16 nScaleInPercent); bool SetFontWidthScale(sal_uInt16 nScaleInPercent);
inline void Invalidate100PercentFontWidth(); inline void Invalidate100PercentFontWidth();
inline bool Is100PercentFontWidthValid() const; inline bool Is100PercentFontWidthValid() const;
void ScaleFontWidth(vcl::RenderContext& rRenderContext); void ScaleFontWidth(vcl::RenderContext const & rRenderContext);
// scales rNonCJKFont and aCJKFont depending on nFontWidthScale and // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and
// sets the 100%-Font-Widths // 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. * 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 nScript;
sal_uInt16 nIdx = 0; sal_uInt16 nIdx = 0;
@ -435,7 +435,7 @@ bool FontPrevWin_Impl::SetFontWidthScale(sal_uInt16 nScale)
return false; return false;
} }
void FontPrevWin_Impl::ScaleFontWidth(vcl::RenderContext& rOutDev) void FontPrevWin_Impl::ScaleFontWidth(vcl::RenderContext const & rOutDev)
{ {
if (!Is100PercentFontWidthValid()) if (!Is100PercentFontWidthValid())
{ {

View File

@ -31,7 +31,7 @@
#include <memory> #include <memory>
sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const & rReq, GraphicObject& rFilterObject )
{ {
const Graphic& rGraphic = rFilterObject.GetGraphic(); const Graphic& rGraphic = rFilterObject.GetGraphic();
sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;

View File

@ -71,7 +71,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN
// misc local helper functions // 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(); const css::lang::Locale *pLocale = rSeq.getConstArray();
sal_Int32 nCount = rSeq.getLength(); sal_Int32 nCount = rSeq.getLength();

View File

@ -28,7 +28,7 @@
#include "svx/dlgutil.hxx" #include "svx/dlgutil.hxx"
// local functions // 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 ) )); nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ));
nLast = static_cast<long>(rField.Denormalize( rField.GetLast( FUNIT_TWIP ) )); nLast = static_cast<long>(rField.Denormalize( rField.GetLast( FUNIT_TWIP ) ));

View File

@ -677,7 +677,7 @@ void SvxSearchDialog::InitControls_Impl()
namespace namespace
{ {
SvtModuleOptions::EFactory getModule(SfxBindings& rBindings) SvtModuleOptions::EFactory getModule(SfxBindings const & rBindings)
{ {
SvtModuleOptions::EFactory eFactory(SvtModuleOptions::EFactory::UNKNOWN_FACTORY); SvtModuleOptions::EFactory eFactory(SvtModuleOptions::EFactory::UNKNOWN_FACTORY);
try try
@ -1128,10 +1128,10 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void )
ClickHdl_Impl(pCtrl); ClickHdl_Impl(pCtrl);
} }
void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) void SvxSearchDialog::ClickHdl_Impl(void const * pCtrl)
{ {
if ( pCtrl && !bSet ) if ( pCtrl && !bSet )
SetModifyFlag_Impl( static_cast<Control*>(pCtrl) ); SetModifyFlag_Impl( static_cast<Control const *>(pCtrl) );
else else
bSet = false; 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 ) ) if (m_pSearchBtn == pCtrl && ( SearchOptionFlags::SEARCH & nOptions ) )
{ {

View File

@ -452,7 +452,7 @@ void SvxNumValueSet::dispose()
void SvxNumValueSet::SetNumberingSettings( void SvxNumValueSet::SetNumberingSettings(
const Sequence<Sequence<PropertyValue> >& aNum, const Sequence<Sequence<PropertyValue> >& aNum,
Reference<XNumberingFormatter>& xFormat, Reference<XNumberingFormatter> const & xFormat,
const Locale& rLocale ) const Locale& rLocale )
{ {
aNumSettings = aNum; aNumSettings = aNum;
@ -469,8 +469,8 @@ void SvxNumValueSet::SetNumberingSettings(
} }
void SvxNumValueSet::SetOutlineNumberingSettings( void SvxNumValueSet::SetOutlineNumberingSettings(
Sequence<Reference<XIndexAccess> >& rOutline, Sequence<Reference<XIndexAccess> > const & rOutline,
Reference<XNumberingFormatter>& xFormat, Reference<XNumberingFormatter> const & xFormat,
const Locale& rLocale) const Locale& rLocale)
{ {
aOutlineSettings = rOutline; aOutlineSettings = rOutline;

View File

@ -79,7 +79,7 @@ E3dExtrudeObj::E3dExtrudeObj()
SetDefaultAttributes(aDefault); SetDefaultAttributes(aDefault);
} }
void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes const & rDefault)
{ {
GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultExtrudeSmoothed())); GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultExtrudeSmoothed()));
GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultExtrudeSmoothFrontBack())); GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultExtrudeSmoothFrontBack()));

View File

@ -460,7 +460,7 @@ void Svx3DWin::SetUILightState(PushButton& rBtn, bool bState)
rBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff ); rBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff );
} }
void Svx3DWin::Update( SfxItemSet& rAttrs ) void Svx3DWin::Update( SfxItemSet const & rAttrs )
{ {
// remember 2d attributes // remember 2d attributes
if(mpRemember2DAttributes) if(mpRemember2DAttributes)

View File

@ -90,7 +90,7 @@ E3dLatheObj::E3dLatheObj()
SetDefaultAttributes(aDefault); SetDefaultAttributes(aDefault);
} }
void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes const & rDefault)
{ {
GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultLatheSmoothed())); GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultLatheSmoothed()));
GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultLatheSmoothFrontBack())); GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultLatheSmoothFrontBack()));

View File

@ -474,7 +474,7 @@ void E3dObject::Insert3DObj(E3dObject* p3DObj)
StructureChanged(); StructureChanged();
} }
void E3dObject::Remove3DObj(E3dObject* p3DObj) void E3dObject::Remove3DObj(E3dObject const * p3DObj)
{ {
DBG_ASSERT(p3DObj, "Remove3DObj with NULL-pointer!"); DBG_ASSERT(p3DObj, "Remove3DObj with NULL-pointer!");

View File

@ -495,7 +495,7 @@ bool E3dView::Paste(
} }
// Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) // 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); bool bRetval(false);
@ -622,7 +622,7 @@ bool E3dView::IsConvertTo3DObjPossible() const
return bRetval; return bRetval;
} }
void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, bool& rAny3D, void E3dView::ImpIsConvertTo3DPossible(SdrObject const * pObj, bool& rAny3D,
bool& rGroupSelected) const bool& rGroupSelected) const
{ {
if(pObj) 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 // Single PathObject, transform this
SdrPathObj* pPath = dynamic_cast<SdrPathObj*>( pObj ); 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) 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) if(pScene && pScene->GetSubList() && pScene->GetSubList()->GetObjCount() > 1)
{ {

View File

@ -1744,7 +1744,7 @@ void FmGridControl::HideColumn(sal_uInt16 nId)
m_nMarkedColumnId = (sal_uInt16)-1; m_nMarkedColumnId = (sal_uInt16)-1;
} }
bool FmGridControl::isColumnSelected(DbGridColumn* _pColumn) bool FmGridControl::isColumnSelected(DbGridColumn const * _pColumn)
{ {
OSL_ENSURE(_pColumn,"Column can not be null!"); OSL_ENSURE(_pColumn,"Column can not be null!");
bool bSelected = false; bool bSelected = false;

View File

@ -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 >(); 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 >(); VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();

View File

@ -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() ) if ( m_pCell.is() )
m_pCell->ImplInitWindow( rParent, _eInitWhat ); 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 }; vcl::Window* pWindows[] = { m_pPainter, m_pWindow };

View File

@ -2665,7 +2665,7 @@ OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
return sRet; 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 // text output for a single row
OUString aText; OUString aText;

View File

@ -264,7 +264,7 @@ namespace svxform
m_pXFormsPage->DoMenuAction(m_nRemoveId); m_pXFormsPage->DoMenuAction(m_nRemoveId);
} }
void DataTreeListBox::RemoveEntry( SvTreeListEntry* _pEntry ) void DataTreeListBox::RemoveEntry( SvTreeListEntry const * _pEntry )
{ {
if ( _pEntry ) if ( _pEntry )
{ {
@ -1445,7 +1445,7 @@ namespace svxform
{ {
ModelSelectHdl(&rBox); ModelSelectHdl(&rBox);
} }
void DataNavigatorWindow::ModelSelectHdl(ListBox* pBox) void DataNavigatorWindow::ModelSelectHdl(ListBox const * pBox)
{ {
sal_Int32 nPos = m_pModelsBox->GetSelectEntryPos(); sal_Int32 nPos = m_pModelsBox->GetSelectEntryPos();
// pBox == NULL, if you want to force a new fill. // 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( xFrom.is(), "copyPropSet(): no source" );
DBG_ASSERT( xTo.is(), "copyPropSet(): no target" ); DBG_ASSERT( xTo.is(), "copyPropSet(): no target" );

View File

@ -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() ); FmFormItem* pFormItem = dynamic_cast<FmFormItem*>( pItem->GetParent()->GetParent() );
try try
@ -1317,7 +1317,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
namespace namespace
{ {
FmFilterItems* getTargetItems(SvTreeListEntry* _pTarget) FmFilterItems* getTargetItems(SvTreeListEntry const * _pTarget)
{ {
FmFilterData* pData = static_cast<FmFilterData*>(_pTarget->GetUserData()); FmFilterData* pData = static_cast<FmFilterData*>(_pTarget->GetUserData());
FmFilterItems* pTargetItems = dynamic_cast<FmFilterItems*>(pData); 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 // the entry for the data
SvTreeListEntry* pEntry = FindEntry(pItem); 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) if (!m_pNavigator)
return; return;

View File

@ -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); 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; ListBoxEntrySet aEmpty;
m_aSelectedEntries.swap( aEmpty ); m_aSelectedEntries.swap( aEmpty );

View File

@ -90,7 +90,7 @@ FmFormObjFactory::~FmFormObjFactory()
// create css::form::Form objects // create css::form::Form objects
namespace 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 try
{ {

View File

@ -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 ) const HelpEvent& rEvt )
{ {
if( pView->IsAction() ) if( pView->IsAction() )

View File

@ -172,7 +172,7 @@ void FmFormView::MarkListHasChanged()
namespace namespace
{ {
const SdrPageWindow* findPageWindow( const SdrPaintView* _pView, OutputDevice* _pWindow ) const SdrPageWindow* findPageWindow( const SdrPaintView* _pView, OutputDevice const * _pWindow )
{ {
SdrPageView* pPageView = _pView->GetSdrPageView(); SdrPageView* pPageView = _pView->GetSdrPageView();
if(pPageView) if(pPageView)
@ -362,7 +362,7 @@ void FmFormView::HideSdrPage()
} }
void FmFormView::ActivateControls(SdrPageView* pPageView) void FmFormView::ActivateControls(SdrPageView const * pPageView)
{ {
if (!pPageView) if (!pPageView)
return; return;
@ -375,7 +375,7 @@ void FmFormView::ActivateControls(SdrPageView* pPageView)
} }
void FmFormView::DeactivateControls(SdrPageView* pPageView) void FmFormView::DeactivateControls(SdrPageView const * pPageView)
{ {
if( !pPageView ) if( !pPageView )
return; 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, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl ) SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )

View File

@ -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; FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : nullptr;
FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : 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, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix,
SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, 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< XPropertySet >& _rxField,
const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, 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; bool bFound = false;
while (rIter.IsMore() && !bFound) while (rIter.IsMore() && !bFound)

View File

@ -87,7 +87,7 @@ namespace svxform
typedef MapModelToShape::value_type ModelShapePair; typedef MapModelToShape::value_type ModelShapePair;
void collectShapeModelMapping( SdrPage* _pPage, MapModelToShape& _rMapping ) void collectShapeModelMapping( SdrPage const * _pPage, MapModelToShape& _rMapping )
{ {
OSL_ENSURE( _pPage, "collectShapeModelMapping: invalid arg!" ); 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()); FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData());
return !pEntryData || dynamic_cast<const FmFormData*>( pEntryData) != nullptr; 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()); FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData());
return pEntryData && dynamic_cast<const FmControlData*>( pEntryData) != nullptr; 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 // 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 // get ParentForm
@ -1410,7 +1410,7 @@ namespace svxform
} }
OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) OUString NavigatorTree::GenerateName( FmEntryData const * pEntryData )
{ {
const sal_uInt16 nMaxCount = 99; const sal_uInt16 nMaxCount = 99;
OUString aNewName; OUString aNewName;
@ -2001,7 +2001,7 @@ namespace svxform
} }
bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData) bool NavigatorTree::IsHiddenControl(FmEntryData const * pEntryData)
{ {
if (pEntryData == nullptr) return false; if (pEntryData == nullptr) return false;
@ -2033,7 +2033,7 @@ namespace svxform
pFormView->UnMarkAll(); pFormView->UnMarkAll();
} }
void NavigatorTree::MarkViewObj(FmFormData* pFormData, bool bDeep ) void NavigatorTree::MarkViewObj(FmFormData const * pFormData, bool bDeep )
{ {
FmFormShell* pFormShell = GetNavModel()->GetFormShell(); FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if( !pFormShell ) if( !pFormShell )
@ -2078,7 +2078,7 @@ namespace svxform
} // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } // 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(); FmEntryDataList* pChildList = pFormData->GetChildList();
FmControlData* pControlData; FmControlData* pControlData;
@ -2095,7 +2095,7 @@ namespace svxform
} // for( sal_uInt32 i=0; i<pChildList->Count(); i++ ) } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
} }
void NavigatorTree::MarkViewObj( FmControlData* pControlData) void NavigatorTree::MarkViewObj( FmControlData const * pControlData)
{ {
if( !pControlData ) if( !pControlData )
return; return;

View File

@ -438,7 +438,7 @@ namespace svxform
} }
void NavigatorTreeModel::RemoveForm(FmFormData* pFormData) void NavigatorTreeModel::RemoveForm(FmFormData const * pFormData)
{ {
// get form and parent // 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 // 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 // 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; FmEntryDataList* pDataList;
if( !pParentData ) 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 // get components from form

View File

@ -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(); pListBox->Clear();
OUString aTitle(SvxResId(RID_STR_FIELDSELECTION)); OUString aTitle(SvxResId(RID_STR_FIELDSELECTION));

View File

@ -743,7 +743,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
return pTheme; return pTheme;
} }
void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme ) void Gallery::ImplDeleteCachedTheme( GalleryTheme const * pTheme )
{ {
GalleryCacheThemeList::const_iterator aEnd = aThemeCache.end(); GalleryCacheThemeList::const_iterator aEnd = aThemeCache.end();
for (GalleryCacheThemeList::iterator it = aThemeCache.begin(); it != aEnd; ++it) for (GalleryCacheThemeList::iterator it = aThemeCache.begin(); it != aEnd; ++it)

View File

@ -994,7 +994,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo
return bRet; 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 ); const GalleryObject* pObject = ImplGetGalleryObject( nPos );
bool bRet = false; bool bRet = false;

View File

@ -134,7 +134,7 @@ namespace svxform
sal_uInt16 _nEditId, sal_uInt16 _nEditId,
sal_uInt16 _nRemoveId); sal_uInt16 _nRemoveId);
void DeleteAndClear(); void DeleteAndClear();
void RemoveEntry( SvTreeListEntry* _pEntry ); void RemoveEntry( SvTreeListEntry const * _pEntry );
}; };
class ReplaceString class ReplaceString
@ -334,7 +334,7 @@ namespace svxform
DECL_LINK( MenuActivateHdl, MenuButton *, void ); DECL_LINK( MenuActivateHdl, MenuButton *, void );
DECL_LINK( ActivatePageHdl, TabControl*, void); DECL_LINK( ActivatePageHdl, TabControl*, void);
DECL_LINK( UpdateHdl, Timer *, void); DECL_LINK( UpdateHdl, Timer *, void);
void ModelSelectHdl(ListBox*); void ModelSelectHdl(ListBox const *);
XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); XFormsPage* GetCurrentPage( sal_uInt16& rCurId );
void LoadModels(); void LoadModels();
void SetPageModel(); void SetPageModel();

View File

@ -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 Update(const css::uno::Reference< css::container::XIndexAccess > & xControllers, const css::uno::Reference< css::form::runtime::XFormController > & xCurrent);
void Clear(); 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 Append(FmFilterItems* pItems, FmFilterItem* pFilterItem);
void SetTextForItem(FmFilterItem* pItem, const OUString& rText); void SetTextForItem(FmFilterItem* pItem, const OUString& rText);
@ -269,7 +269,7 @@ protected:
void DeleteSelection(); void DeleteSelection();
SvTreeListEntry* FindEntry(const FmFilterData* pItem) const; SvTreeListEntry* FindEntry(const FmFilterData* pItem) const;
void Insert(FmFilterData* pItem, sal_uLong nPos); void Insert(FmFilterData* pItem, sal_uLong nPos);
void Remove(FmFilterData* pItem); void Remove(FmFilterData const * pItem);
DECL_LINK(OnRemove, void*, void); DECL_LINK(OnRemove, void*, void);
DECL_LINK(OnDropActionTimer, Timer*, void); DECL_LINK(OnDropActionTimer, Timer*, void);
@ -318,7 +318,7 @@ public:
virtual ~FmFilterNavigatorWin() override; virtual ~FmFilterNavigatorWin() override;
virtual void dispose() 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 StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
void FillInfo( SfxChildWinInfo& rInfo ) const override; void FillInfo( SfxChildWinInfo& rInfo ) const override;

View File

@ -168,12 +168,12 @@ namespace svxform
const css::uno::Reference< css::form::XForms >& _rxFormsRoot const css::uno::Reference< css::form::XForms >& _rxFormsRoot
) { m_xFormsRoot = _rxFormsRoot; } ) { m_xFormsRoot = _rxFormsRoot; }
void buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); void buildPathFormat(SvTreeListBox const * pTreeBox, SvTreeListEntry const * pRoot);
// assembles m_aControlPaths from m_aSelectedEntries // assembles m_aControlPaths from m_aSelectedEntries
// (it is assumed that the entries are sorted in m_aSelectedEntries with respect to the neighbor relationship) // (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 // 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); void addHiddenControlsFormat(const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& seqInterfaces);

View File

@ -326,10 +326,10 @@ namespace svxform
void UpdateContent( const css::uno::Reference< css::form::XForms >& xForms ); void UpdateContent( const css::uno::Reference< css::form::XForms >& xForms );
void InsertForm(const css::uno::Reference< css::form::XForm >& xForm, sal_uInt32 nRelPos); 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 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 InsertSdrObj(const SdrObject* pSdrObj);
void RemoveSdrObj(const SdrObject* pSdrObj); void RemoveSdrObj(const SdrObject* pSdrObj);
@ -346,7 +346,7 @@ namespace svxform
virtual ~NavigatorTreeModel() override; virtual ~NavigatorTreeModel() override;
void FillBranch( FmFormData* pParentData ); void FillBranch( FmFormData* pParentData );
void ClearBranch( FmFormData* pParentData ); void ClearBranch( FmFormData const * pParentData );
void UpdateContent( FmFormShell* pNewShell ); void UpdateContent( FmFormShell* pNewShell );
void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = CONTAINER_APPEND, void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = CONTAINER_APPEND,
@ -362,9 +362,9 @@ namespace svxform
FmFormShell* GetFormShell() const { return m_pFormShell; } FmFormShell* GetFormShell() const { return m_pFormShell; }
FmFormPage* GetFormPage() const { return m_pFormPage; } FmFormPage* GetFormPage() const { return m_pFormPage; }
FmEntryData* FindData( const css::uno::Reference< css::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true ); 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; } 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); SdrObject* Search(SdrObjListIter& rIter, const css::uno::Reference< css::form::XFormComponent >& xComp);
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; 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_bInitialUpdate : 1; // am I the first time in the UpdateContent?
bool m_bKeyboardCut : 1; bool m_bKeyboardCut : 1;
FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName ); FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry const * pParentEntry, bool bEditName );
void NewForm( SvTreeListEntry* pParentEntry ); void NewForm( SvTreeListEntry const * pParentEntry );
SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos );
void Remove( FmEntryData* pEntryData ); void Remove( FmEntryData* pEntryData );
@ -440,7 +440,7 @@ namespace svxform
void SynchronizeMarkList(); void SynchronizeMarkList();
// reverse direction of SynchronizeMarkList: selects in the view all controls corresponding to the current selection // 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, // in the Select I usually update the Marklist of the corresponding view,
// with the following functions I can control the locking of this behavior // with the following functions I can control the locking of this behavior
@ -448,7 +448,7 @@ namespace svxform
void UnlockSelectionHandling() { --m_nSelectLock; } void UnlockSelectionHandling() { --m_nSelectLock; }
bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; } 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( OnEdit, void*, void );
DECL_LINK( OnDropActionTimer, Timer*, void ); DECL_LINK( OnDropActionTimer, Timer*, void );
@ -472,14 +472,14 @@ namespace svxform
void Clear(); void Clear();
void UpdateContent( FmFormShell* pFormShell ); void UpdateContent( FmFormShell* pFormShell );
void MarkViewObj( FmFormData* pFormData, bool bDeep ); void MarkViewObj( FmFormData const * pFormData, bool bDeep );
void MarkViewObj( FmControlData* pControlData ); void MarkViewObj( FmControlData const * pControlData );
void UnmarkAllViewObj(); void UnmarkAllViewObj();
static bool IsFormEntry( SvTreeListEntry* pEntry ); static bool IsFormEntry( SvTreeListEntry const * pEntry );
static bool IsFormComponentEntry( SvTreeListEntry* pEntry ); static bool IsFormComponentEntry( SvTreeListEntry const * pEntry );
OUString GenerateName( FmEntryData* pEntryData ); OUString GenerateName( FmEntryData const * pEntryData );
NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } NavigatorTreeModel* GetNavModel() const { return m_pNavModel; }
SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); SvTreeListEntry* FindEntry( FmEntryData* pEntryData );

View File

@ -232,7 +232,7 @@ public:
*/ */
void resumeTabOrderUpdate(); void resumeTabOrderUpdate();
void onCreatedFormObject( FmFormObj& _rFormObject ); void onCreatedFormObject( FmFormObj const & _rFormObject );
void breakCreateFormObject(); void breakCreateFormObject();
@ -250,7 +250,7 @@ private:
SdrObject* implCreateXFormsControl( const svx::OXFormsDescriptor &_rDesc ); SdrObject* implCreateXFormsControl( const svx::OXFormsDescriptor &_rDesc );
static bool createControlLabelPair( static bool createControlLabelPair(
OutputDevice& _rOutDev, OutputDevice const & _rOutDev,
sal_Int32 _nXOffsetMM, sal_Int32 _nXOffsetMM,
sal_Int32 _nYOffsetMM, sal_Int32 _nYOffsetMM,
const css::uno::Reference< css::beans::XPropertySet >& _rxField, const css::uno::Reference< css::beans::XPropertySet >& _rxField,
@ -267,7 +267,7 @@ private:
); );
bool createControlLabelPair( bool createControlLabelPair(
OutputDevice& _rOutDev, OutputDevice const & _rOutDev,
sal_Int32 _nXOffsetMM, sal_Int32 _nXOffsetMM,
sal_Int32 _nYOffsetMM, sal_Int32 _nYOffsetMM,
const css::uno::Reference< css::beans::XPropertySet >& _rxField, const css::uno::Reference< css::beans::XPropertySet >& _rxField,

View File

@ -166,7 +166,7 @@ public:
void SetReadOnly(bool bRead){m_bReadOnly = bRead;} void SetReadOnly(bool bRead){m_bReadOnly = bRead;}
void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;} 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 // properties that can bleed through onto the css::frame::Controller
sal_Int16 SetAlignment(sal_Int16 _nAlign); 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 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 ); 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; 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; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
bool Commit() {return m_pCellControl->Commit();} 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 ); } { m_pCellControl->ImplInitWindow( rParent, _eInitWhat ); }
bool isAlignedController() const { return m_pCellControl->isAlignedController(); } bool isAlignedController() const { return m_pCellControl->isAlignedController(); }

View File

@ -89,7 +89,7 @@ public:
virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState) override; const SfxPoolItem* pState) override;
void UpdateContent(FmFormShell*); void UpdateContent(FmFormShell const *);
void UpdateContent(const css::uno::Reference< css::form::XForm > &); void UpdateContent(const css::uno::Reference< css::form::XForm > &);
void FillInfo( SfxChildWinInfo& rInfo ) const override; void FillInfo( SfxChildWinInfo& rInfo ) const override;

View File

@ -216,7 +216,7 @@ namespace sdr
// This is the call from the destructor of the asynch graphic loading event. // 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 // 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. // 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) if(mpAsynchLoadEvent)
{ {

View File

@ -594,7 +594,7 @@ namespace sdr { namespace contact {
/// creates an XControl for the given device and SdrUnoObj /// creates an XControl for the given device and SdrUnoObj
static bool static bool
createControlForDevice( createControlForDevice(
IPageViewAccess& _rPageView, IPageViewAccess const & _rPageView,
const OutputDevice& _rDevice, const OutputDevice& _rDevice,
const SdrUnoObj& _rUnoObject, const SdrUnoObj& _rUnoObject,
const basegfx::B2DHomMatrix& _rInitialViewTransformation, const basegfx::B2DHomMatrix& _rInitialViewTransformation,
@ -700,7 +700,7 @@ namespace sdr { namespace contact {
We're not disposed. We're not disposed.
*/ */
static void impl_adjustControlVisibilityToLayerVisibility_throw( const ControlHolder& _rxControl, const SdrUnoObj& _rUnoObject, 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 /** 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 /** ensures that we have a control for the given PageView/OutputDevice
*/ */
bool impl_ensureControl_nothrow( bool impl_ensureControl_nothrow(
IPageViewAccess& _rPageView, IPageViewAccess const & _rPageView,
const OutputDevice& _rDevice, const OutputDevice& _rDevice,
const basegfx::B2DHomMatrix& _rInitialViewTransformation 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 ) const basegfx::B2DHomMatrix& _rInitialViewTransformation )
{ {
if ( m_bCreatingControl ) 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 OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, const basegfx::B2DHomMatrix& _rInitialViewTransformation,
const basegfx::B2DHomMatrix& _rInitialZoomNormalization, ControlHolder& _out_rControl ) const basegfx::B2DHomMatrix& _rInitialZoomNormalization, ControlHolder& _out_rControl )
{ {
@ -1167,7 +1167,7 @@ namespace sdr { namespace contact {
void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( const ControlHolder& _rControl, 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 // 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 // default, and the Drawing Layer will simply not call our paint routine, if we're in

View File

@ -56,7 +56,7 @@ AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup()
disposeOnce(); disposeOnce();
} }
void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem* pGradientItem) void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem const * pGradientItem)
{ {
const XGradient& rGradient = pGradientItem->GetGradientValue(); const XGradient& rGradient = pGradientItem->GetGradientValue();
@ -85,7 +85,7 @@ void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem* pGrad
maMtrTrgrBorder->SetValue(aGradient.GetBorder()); maMtrTrgrBorder->SetValue(aGradient.GetBorder());
} }
void AreaTransparencyGradientPopup::Rearrange(XFillFloatTransparenceItem* pGradientItem) void AreaTransparencyGradientPopup::Rearrange(XFillFloatTransparenceItem const * pGradientItem)
{ {
InitStatus(pGradientItem); InitStatus(pGradientItem);
const XGradient& rGradient = pGradientItem->GetGradientValue(); const XGradient& rGradient = pGradientItem->GetGradientValue();

View File

@ -51,7 +51,7 @@ void LineWidthValueSet::dispose()
ValueSet::dispose(); ValueSet::dispose();
} }
void LineWidthValueSet::SetUnit(OUString* str) void LineWidthValueSet::SetUnit(OUString const * str)
{ {
for(int i = 0; i < 9; i++) for(int i = 0; i < 9; i++)
{ {

View File

@ -32,7 +32,7 @@ public:
virtual ~LineWidthValueSet() override; virtual ~LineWidthValueSet() override;
virtual void dispose() override; virtual void dispose() override;
void SetUnit(OUString* str); void SetUnit(OUString const * str);
void SetSelItem(sal_uInt16 nSel); void SetSelItem(sal_uInt16 nSel);
sal_uInt16 GetSelItem() { return nSelItem;} sal_uInt16 GetSelItem() { return nSelItem;}
void SetImage(const Image& img); void SetImage(const Image& img);

View File

@ -85,7 +85,7 @@ void TextUnderlineControl::dispose()
SfxPopupWindow::dispose(); SfxPopupWindow::dispose();
} }
FontLineStyle TextUnderlineControl::getLineStyle(Button* pButton) FontLineStyle TextUnderlineControl::getLineStyle(Button const * pButton)
{ {
if(pButton == maSingle) if(pButton == maSingle)
return LINESTYLE_SINGLE; return LINESTYLE_SINGLE;

View File

@ -49,7 +49,7 @@ private:
VclPtr<PushButton> maWave; VclPtr<PushButton> maWave;
VclPtr<PushButton> maMoreOptions; VclPtr<PushButton> maMoreOptions;
FontLineStyle getLineStyle(Button* pButton); FontLineStyle getLineStyle(Button const * pButton);
DECL_LINK(PBClickHdl, Button*, void); DECL_LINK(PBClickHdl, Button*, void);
}; };

View File

@ -27,7 +27,7 @@
#include <vcl/outdev.hxx> #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 // handle start color
rV.aCol1 = rG.aGradient.GetStartColor(); 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) bool bMoveSingle, bool bMoveFirst)
{ {
// fill old gradient to new gradient to have a base // fill old gradient to new gradient to have a base

View File

@ -45,10 +45,10 @@ class GradTransformer
public: public:
GradTransformer() {} GradTransformer() {}
static void GradToVec(GradTransGradient& rG, GradTransVector& rV, static void GradToVec(GradTransGradient const & rG, GradTransVector& rV,
const SdrObject* pObj); const SdrObject* pObj);
static void VecToGrad(GradTransVector& rV, GradTransGradient& rG, static void VecToGrad(GradTransVector const & rV, GradTransGradient& rG,
GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst); GradTransGradient const & rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst);
}; };
#endif // INCLUDED_SVX_SOURCE_SVDRAW_GRADTRNS_HXX #endif // INCLUDED_SVX_SOURCE_SVDRAW_GRADTRNS_HXX

View File

@ -38,7 +38,7 @@ class CandidateMgr
std::set<VclPtr<vcl::Window> > m_aDeletedCandidates; std::set<VclPtr<vcl::Window> > m_aDeletedCandidates;
DECL_LINK(WindowEventListener, VclWindowEvent&, void); DECL_LINK(WindowEventListener, VclWindowEvent&, void);
public: public:
void PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect); void PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect);
~CandidateMgr(); ~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()) if (!rWindow.IsChildTransparentModeEnabled())
return; return;
@ -71,7 +71,7 @@ void PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPi
aManager.PaintTransparentChildren(rWindow, rPixelRect); 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 ); vcl::Window * pCandidate = rWindow.GetWindow( GetWindowType::FirstChild );
while (pCandidate) while (pCandidate)

View File

@ -2811,7 +2811,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const
#define DRAG_CROOK_RASTER_MAXIMUM (15) #define DRAG_CROOK_RASTER_MAXIMUM (15)
#define DRAG_CROOK_RASTER_DISTANCE (30) #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; basegfx::B2DPolyPolygon aRetval;

View File

@ -112,7 +112,7 @@ void SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos)
mpModel->SetChanged(); mpModel->SetChanged();
} }
bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const bool SdrEditView::ImpDelLayerCheck(SdrObjList const * pOL, SdrLayerID nDelID) const
{ {
bool bDelAll(true); bool bDelAll(true);

View File

@ -1995,7 +1995,7 @@ void SdrEditView::ConvertMarkedToPolyObj()
namespace namespace
{ {
GDIMetaFile GetMetaFile(SdrGrafObj* pGraf) GDIMetaFile GetMetaFile(SdrGrafObj const * pGraf)
{ {
if (pGraf->HasGDIMetaFile()) if (pGraf->HasGDIMetaFile())
return pGraf->GetTransformedGraphic(SdrGrafObjTransformsAttrs::COLOR|SdrGrafObjTransformsAttrs::MIRROR).GetGDIMetaFile(); return pGraf->GetTransformedGraphic(SdrGrafObjTransformsAttrs::COLOR|SdrGrafObjTransformsAttrs::MIRROR).GetGDIMetaFile();

View File

@ -166,7 +166,7 @@ SdrPageView* SdrObjEditView::ShowSdrPage(SdrPage* pPage)
} }
/// Removes outliner views registered in other draw views that use pOutputDevice. /// 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()) if (!comphelper::LibreOfficeKit::isActive())
return; return;
@ -454,7 +454,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::
rOutlView.ShowCursor(/*bGotoCursor=*/true, /*bActivate=*/true); rOutlView.ShowCursor(/*bGotoCursor=*/true, /*bActivate=*/true);
} }
void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView const & rOutlView) const
{ {
vcl::Window* pWin = rOutlView.GetWindow(); 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 (pWin==nullptr) return nullptr;
if (pTextEditOutliner==nullptr) return nullptr; if (pTextEditOutliner==nullptr) return nullptr;
@ -2258,7 +2258,7 @@ static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool,
return aPaintSet; 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; OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr;
if(pParaObj) if(pParaObj)

View File

@ -116,7 +116,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(
checkClip(); 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()); const sal_uLong nCount(rMtf.GetActionSize());
@ -259,7 +259,7 @@ size_t ImpSdrGDIMetaFileImport::DoImport(
sal_uInt32 nActionsToReport(0); sal_uInt32 nActionsToReport(0);
// execute // execute
DoLoopActions(const_cast< GDIMetaFile& >(rMtf), pProgrInfo, &nActionsToReport); DoLoopActions(rMtf, pProgrInfo, &nActionsToReport);
if(pProgrInfo) 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 // #i73407# reformulation to use new B2DPolygon classes
const basegfx::B2DPoint aStart(rAct.GetStartPoint().X(), rAct.GetStartPoint().Y()); 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()); SdrRectObj* pRect=new SdrRectObj(rAct.GetRect());
SetAttributes(pRect); SetAttributes(pRect);
InsertObj(pRect); InsertObj(pRect);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction const & rAct)
{ {
SdrRectObj* pRect=new SdrRectObj(rAct.GetRect()); SdrRectObj* pRect=new SdrRectObj(rAct.GetRect());
SetAttributes(pRect); SetAttributes(pRect);
@ -722,14 +722,14 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct)
InsertObj(pRect); InsertObj(pRect);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaEllipseAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaEllipseAction const & rAct)
{ {
SdrCircObj* pCirc=new SdrCircObj(OBJ_CIRC,rAct.GetRect()); SdrCircObj* pCirc=new SdrCircObj(OBJ_CIRC,rAct.GetRect());
SetAttributes(pCirc); SetAttributes(pCirc);
InsertObj(pCirc); InsertObj(pCirc);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaArcAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaArcAction const & rAct)
{ {
Point aCenter(rAct.GetRect().Center()); Point aCenter(rAct.GetRect().Center());
long nStart=GetAngle(rAct.GetStartPoint()-aCenter); long nStart=GetAngle(rAct.GetStartPoint()-aCenter);
@ -739,7 +739,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaArcAction& rAct)
InsertObj(pCirc); InsertObj(pCirc);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaPieAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaPieAction const & rAct)
{ {
Point aCenter(rAct.GetRect().Center()); Point aCenter(rAct.GetRect().Center());
long nStart=GetAngle(rAct.GetStartPoint()-aCenter); long nStart=GetAngle(rAct.GetStartPoint()-aCenter);
@ -749,7 +749,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaPieAction& rAct)
InsertObj(pCirc); InsertObj(pCirc);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaChordAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaChordAction const & rAct)
{ {
Point aCenter(rAct.GetRect().Center()); Point aCenter(rAct.GetRect().Center());
long nStart=GetAngle(rAct.GetStartPoint()-aCenter); long nStart=GetAngle(rAct.GetStartPoint()-aCenter);
@ -883,7 +883,7 @@ bool ImpSdrGDIMetaFileImport::isClip() const
return !maClip.getB2DRange().isEmpty(); return !maClip.getB2DRange().isEmpty();
} }
void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction& rAct ) void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction const & rAct )
{ {
// #i73407# reformulation to use new B2DPolygon classes // #i73407# reformulation to use new B2DPolygon classes
basegfx::B2DPolygon aSource(rAct.GetPolygon().getB2DPolygon()); 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 // #i73407# reformulation to use new B2DPolygon classes
basegfx::B2DPolygon aSource(rAct.GetPolygon().getB2DPolygon()); 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 // #i73407# reformulation to use new B2DPolygon classes
basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon()); basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon());
@ -1033,28 +1033,28 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
InsertObj( pText, false ); InsertObj( pText, false );
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaTextAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaTextAction const & rAct)
{ {
OUString aStr(rAct.GetText()); OUString aStr(rAct.GetText());
aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen()); aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct ); ImportText( rAct.GetPoint(), aStr, rAct );
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaTextArrayAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaTextArrayAction const & rAct)
{ {
OUString aStr(rAct.GetText()); OUString aStr(rAct.GetText());
aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen()); aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct ); ImportText( rAct.GetPoint(), aStr, rAct );
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaStretchTextAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaStretchTextAction const & rAct)
{ {
OUString aStr(rAct.GetText()); OUString aStr(rAct.GetText());
aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen()); aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct ); ImportText( rAct.GetPoint(), aStr, rAct );
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetPoint(),rAct.GetBitmap().GetSizePixel()); tools::Rectangle aRect(rAct.GetPoint(),rAct.GetBitmap().GetSizePixel());
aRect.Right()++; aRect.Bottom()++; aRect.Right()++; aRect.Bottom()++;
@ -1066,7 +1066,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetPoint(),rAct.GetSize()); tools::Rectangle aRect(rAct.GetPoint(),rAct.GetSize());
aRect.Right()++; aRect.Bottom()++; aRect.Right()++; aRect.Bottom()++;
@ -1078,7 +1078,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetPoint(),rAct.GetBitmapEx().GetSizePixel()); tools::Rectangle aRect(rAct.GetPoint(),rAct.GetBitmapEx().GetSizePixel());
aRect.Right()++; aRect.Bottom()++; aRect.Right()++; aRect.Bottom()++;
@ -1090,7 +1090,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetPoint(),rAct.GetSize()); tools::Rectangle aRect(rAct.GetPoint(),rAct.GetSize());
aRect.Right()++; aRect.Bottom()++; 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 // #i73407# reformulation to use new B2DPolygon classes
basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon()); 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; 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; GDIMetaFile aTemp;
@ -1266,7 +1266,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaTextRectAction& rAct)
DoLoopActions(aTemp, nullptr, nullptr); DoLoopActions(aTemp, nullptr, nullptr);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetDestPoint(), rAct.GetDestSize()); tools::Rectangle aRect(rAct.GetDestPoint(), rAct.GetDestSize());
Bitmap aBitmap(rAct.GetBitmap()); Bitmap aBitmap(rAct.GetBitmap());
@ -1282,7 +1282,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetDestPoint(),rAct.GetDestSize()); tools::Rectangle aRect(rAct.GetDestPoint(),rAct.GetDestSize());
BitmapEx aBitmapEx(rAct.GetBitmapEx()); BitmapEx aBitmapEx(rAct.GetBitmapEx());
@ -1298,7 +1298,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetPoint(), rAct.GetBitmap().GetSizePixel()); tools::Rectangle aRect(rAct.GetPoint(), rAct.GetBitmap().GetSizePixel());
BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor()); BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor());
@ -1312,7 +1312,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetPoint(), rAct.GetSize()); tools::Rectangle aRect(rAct.GetPoint(), rAct.GetSize());
BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor()); BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor());
@ -1326,7 +1326,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction& rAct)
InsertObj(pGraf); InsertObj(pGraf);
} }
void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction& rAct) void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction const & rAct)
{ {
tools::Rectangle aRect(rAct.GetDestPoint(), rAct.GetDestSize()); tools::Rectangle aRect(rAct.GetDestPoint(), rAct.GetDestSize());
BitmapEx aBitmapEx(rAct.GetBitmap(), rAct.GetColor()); 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()); 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()); 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()); 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(); const GDIMetaFile& rMtf = rAct.GetGDIMetaFile();

View File

@ -88,24 +88,24 @@ protected:
bool isClip() const; bool isClip() const;
// actions // actions
void DoAction(MetaLineAction & rAct); void DoAction(MetaLineAction const & rAct);
void DoAction(MetaRectAction & rAct); void DoAction(MetaRectAction const & rAct);
void DoAction(MetaRoundRectAction & rAct); void DoAction(MetaRoundRectAction const & rAct);
void DoAction(MetaEllipseAction & rAct); void DoAction(MetaEllipseAction const & rAct);
void DoAction(MetaArcAction & rAct); void DoAction(MetaArcAction const & rAct);
void DoAction(MetaPieAction & rAct); void DoAction(MetaPieAction const & rAct);
void DoAction(MetaChordAction & rAct); void DoAction(MetaChordAction const & rAct);
void DoAction(MetaPolyLineAction & rAct); void DoAction(MetaPolyLineAction const & rAct);
void DoAction(MetaPolygonAction & rAct); void DoAction(MetaPolygonAction const & rAct);
void DoAction(MetaPolyPolygonAction & rAct); void DoAction(MetaPolyPolygonAction const & rAct);
void DoAction(MetaTextAction & rAct); void DoAction(MetaTextAction const & rAct);
void DoAction(MetaTextArrayAction & rAct); void DoAction(MetaTextArrayAction const & rAct);
void DoAction(MetaStretchTextAction & rAct); void DoAction(MetaStretchTextAction const & rAct);
void DoAction(MetaBmpAction & rAct); void DoAction(MetaBmpAction const & rAct);
void DoAction(MetaBmpScaleAction & rAct); void DoAction(MetaBmpScaleAction const & rAct);
void DoAction(MetaBmpExAction & rAct); void DoAction(MetaBmpExAction const & rAct);
void DoAction(MetaBmpExScaleAction & rAct); void DoAction(MetaBmpExScaleAction const & rAct);
void DoAction(MetaHatchAction & rAct); void DoAction(MetaHatchAction const & rAct);
void DoAction(MetaLineColorAction & rAct); void DoAction(MetaLineColorAction & rAct);
void DoAction(MetaMapModeAction & rAct); void DoAction(MetaMapModeAction & rAct);
void DoAction(MetaFillColorAction & rAct) { rAct.Execute(mpVD); } void DoAction(MetaFillColorAction & rAct) { rAct.Execute(mpVD); }
@ -123,21 +123,21 @@ protected:
// #i125211# The MetaCommentAction needs to advance (if used), thus // #i125211# The MetaCommentAction needs to advance (if used), thus
// give current metafile and index which may be changed // 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 // missing actions added
void DoAction(MetaTextRectAction& rAct); void DoAction(MetaTextRectAction const & rAct);
void DoAction(MetaBmpScalePartAction& rAct); void DoAction(MetaBmpScalePartAction const & rAct);
void DoAction(MetaBmpExScalePartAction& rAct); void DoAction(MetaBmpExScalePartAction const & rAct);
void DoAction(MetaMaskAction& rAct); void DoAction(MetaMaskAction const & rAct);
void DoAction(MetaMaskScaleAction& rAct); void DoAction(MetaMaskScaleAction const & rAct);
void DoAction(MetaMaskScalePartAction& rAct); void DoAction(MetaMaskScalePartAction const & rAct);
void DoAction(MetaGradientAction& rAct); void DoAction(MetaGradientAction const & rAct);
void DoAction(MetaTransparentAction& rAct); void DoAction(MetaTransparentAction const & rAct);
void DoAction(MetaRefPointAction& rAct) { rAct.Execute(mpVD); } void DoAction(MetaRefPointAction& rAct) { rAct.Execute(mpVD); }
void DoAction(MetaTextLineColorAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } void DoAction(MetaTextLineColorAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; }
void DoAction(MetaFloatTransparentAction& rAct); void DoAction(MetaFloatTransparentAction const & rAct);
void DoAction(MetaGradientExAction& rAct); void DoAction(MetaGradientExAction const & rAct);
void DoAction(MetaLayoutModeAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } void DoAction(MetaLayoutModeAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; }
void DoAction(MetaTextLanguageAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } void DoAction(MetaTextLanguageAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; }
void DoAction(MetaOverlineColorAction& 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 CheckLastLineMerge(const basegfx::B2DPolygon& rSrcPoly);
bool CheckLastPolyLineAndFillMerge(const basegfx::B2DPolyPolygon& rPolyPolygon); 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: private:
// Copy assignment is forbidden and not implemented. // Copy assignment is forbidden and not implemented.

View File

@ -1058,7 +1058,7 @@ void SdrItemBrowser::GetFocus()
aBrowse->GrabFocus(); aBrowse->GrabFocus();
} }
vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView const & rView)
{ {
const sal_uInt32 nWinCount(rView.PaintWindowCount()); const sal_uInt32 nWinCount(rView.PaintWindowCount());

View File

@ -603,7 +603,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
return rName; return rName;
} }
bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, tools::Rectangle& rRect) const bool SdrMarkList::TakeBoundRect(SdrPageView const * pPV, tools::Rectangle& rRect) const
{ {
bool bFnd(false); bool bFnd(false);
tools::Rectangle aR; tools::Rectangle aR;
@ -634,7 +634,7 @@ bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, tools::Rectangle& rRect) const
return bFnd; return bFnd;
} }
bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, tools::Rectangle& rRect) const bool SdrMarkList::TakeSnapRect(SdrPageView const * pPV, tools::Rectangle& rRect) const
{ {
bool bFnd(false); bool bFnd(false);

View File

@ -844,7 +844,7 @@ uno::Reference<embed::XStorage> SdrModel::GetDocumentStorage() const
uno::Reference<io::XInputStream> uno::Reference<io::XInputStream>
SdrModel::GetDocumentStream( OUString const& rURL, SdrModel::GetDocumentStream( OUString const& rURL,
::comphelper::LifecycleProxy & rProxy) const ::comphelper::LifecycleProxy const & rProxy) const
{ {
uno::Reference<embed::XStorage> const xStorage(GetDocumentStorage()); uno::Reference<embed::XStorage> const xStorage(GetDocumentStorage());
if (!xStorage.is()) if (!xStorage.is())

Some files were not shown because too many files have changed in this diff Show More