[Libreoffice-commits] core.git: include/svtools svtools/inc svtools/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jul 19 07:26:52 UTC 2017
include/svtools/brwbox.hxx | 2 +-
include/svtools/editbrowsebox.hxx | 2 +-
include/svtools/embedhlp.hxx | 2 +-
include/svtools/fileview.hxx | 2 +-
include/svtools/fmtfield.hxx | 2 +-
include/svtools/grfmgr.hxx | 10 +++++-----
include/svtools/insdlg.hxx | 2 +-
include/svtools/ivctrl.hxx | 4 ++--
include/svtools/parhtml.hxx | 2 +-
include/svtools/popupmenucontrollerbase.hxx | 2 +-
include/svtools/prnsetup.hxx | 8 ++++----
include/svtools/ruler.hxx | 2 +-
include/svtools/sampletext.hxx | 6 +++---
include/svtools/scriptedtext.hxx | 2 +-
include/svtools/svlbitm.hxx | 2 +-
include/svtools/svparser.hxx | 2 +-
include/svtools/svtabbx.hxx | 2 +-
include/svtools/toolbarmenu.hxx | 2 +-
include/svtools/treelist.hxx | 10 +++++-----
include/svtools/treelistbox.hxx | 14 +++++++-------
include/svtools/valueset.hxx | 4 ++--
include/svtools/wizardmachine.hxx | 2 +-
svtools/inc/roadmap.hxx | 2 +-
svtools/source/brwbox/brwbox2.cxx | 2 +-
svtools/source/brwbox/brwbox3.cxx | 2 +-
svtools/source/brwbox/datwin.cxx | 2 +-
svtools/source/brwbox/datwin.hxx | 2 +-
svtools/source/brwbox/editbrowsebox.cxx | 2 +-
svtools/source/contnr/fileview.cxx | 4 ++--
svtools/source/contnr/imivctl.hxx | 4 ++--
svtools/source/contnr/imivctl1.cxx | 4 ++--
svtools/source/contnr/ivctrl.cxx | 4 ++--
svtools/source/contnr/svimpbox.cxx | 14 +++++++-------
svtools/source/contnr/svlbitm.cxx | 2 +-
svtools/source/contnr/svtabbx.cxx | 2 +-
svtools/source/contnr/treelist.cxx | 6 +++---
svtools/source/contnr/treelistbox.cxx | 14 +++++++-------
svtools/source/control/ctrlbox.cxx | 2 +-
svtools/source/control/ctrltool.cxx | 2 +-
svtools/source/control/fmtfield.cxx | 2 +-
svtools/source/control/roadmap.cxx | 6 +++---
svtools/source/control/ruler.cxx | 2 +-
svtools/source/control/scriptedtext.cxx | 6 +++---
svtools/source/control/tabbar.cxx | 2 +-
svtools/source/control/toolbarmenu.cxx | 8 ++++----
svtools/source/control/toolbarmenuimp.hxx | 2 +-
svtools/source/control/valueset.cxx | 4 ++--
svtools/source/dialogs/insdlg.cxx | 2 +-
svtools/source/dialogs/prnsetup.cxx | 8 ++++----
svtools/source/dialogs/wizardmachine.cxx | 2 +-
svtools/source/graphic/grfcache.cxx | 14 +++++++-------
svtools/source/graphic/grfcache.hxx | 4 ++--
svtools/source/graphic/grfmgr.cxx | 4 ++--
svtools/source/graphic/grfmgr2.cxx | 8 ++++----
svtools/source/graphic/provider.cxx | 2 +-
svtools/source/inc/svimpbox.hxx | 12 ++++++------
svtools/source/misc/embedhlp.cxx | 2 +-
svtools/source/misc/sampletext.cxx | 8 ++++----
svtools/source/svhtml/parhtml.cxx | 2 +-
svtools/source/uno/popupmenucontrollerbase.cxx | 2 +-
svtools/source/uno/treecontrolpeer.cxx | 10 +++++-----
svtools/source/uno/treecontrolpeer.hxx | 10 +++++-----
62 files changed, 139 insertions(+), 139 deletions(-)
New commits:
commit 7b83ed313e0e54cb7da4525d13f63937e10867fa
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jul 18 12:53:40 2017 +0200
loplugin:constparams in svtools
Change-Id: I2620419828864363af55011abe56143bb7d42f48
Reviewed-on: https://gerrit.libreoffice.org/40154
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index a5eee89784fe..53ca0cc2cbb8 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -335,7 +335,7 @@ protected:
*/
virtual bool SeekRow( long nRow ) = 0;
void DrawCursor();
- void PaintData(vcl::Window& rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
+ void PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
// Advice for the subclass: the visible scope of rows has changed.
// The subclass is able to announce changes of the model with the
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index c71d57e42461..2e6ca0d7e71e 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -560,7 +560,7 @@ namespace svt
virtual CellController* GetController(long nRow, sal_uInt16 nCol);
virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol);
- static void ResizeController(CellControllerRef& rController, const tools::Rectangle&);
+ static void ResizeController(CellControllerRef const & rController, const tools::Rectangle&);
virtual void DoubleClick(const BrowserMouseEvent&) override;
void ActivateCell() { ActivateCell(GetCurRow(), GetCurColumnId()); }
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index 3db446579142..30a5cdc6338e 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -96,7 +96,7 @@ public:
// the original size of the object ( size of the icon for iconified object )
// no conversion is done if no target mode is provided
- Size GetSize( MapMode* pTargetMapMode ) const;
+ Size GetSize( MapMode const * pTargetMapMode ) const;
void SetGraphic( const Graphic& rGraphic, const OUString& rMediaType );
void SetGraphicStream(
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index df2be7551307..8e1d14df36fc 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -90,7 +90,7 @@ public:
void SetViewMode( FileViewMode eMode );
const OUString& GetViewURL() const;
- static OUString GetURL( SvTreeListEntry* pEntry );
+ static OUString GetURL( SvTreeListEntry const * pEntry );
OUString GetCurrentURL() const;
bool GetParentURL( OUString& _rParentURL ) const;
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 680c611999ba..99e3998e2451 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -236,7 +236,7 @@ protected:
// any aspect of the current format has changed
virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
- void ImplSetTextImpl(const OUString& rNew, Selection* pNewSel);
+ void ImplSetTextImpl(const OUString& rNew, Selection const * pNewSel);
void ImplSetValue(double dValue, bool bForce);
bool ImplGetValue(double& dNewVal);
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 6f9ca865957f..a6339128c479 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -202,7 +202,7 @@ private:
static void SVT_DLLPRIVATE ImplEnsureGraphicManager();
void SVT_DLLPRIVATE ImplAutoSwapIn();
bool SVT_DLLPRIVATE ImplGetCropParams(
- OutputDevice* pOut,
+ OutputDevice const * pOut,
Point& rPt,
Size& rSz,
const GraphicAttr* pAttr,
@@ -337,7 +337,7 @@ public:
}
bool IsCached(
- OutputDevice* pOut,
+ OutputDevice const * pOut,
const Size& rSz,
const GraphicAttr* pAttr,
GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD
@@ -505,7 +505,7 @@ private:
OutputDevice* pOut,
const Point& rPt,
const Size& rSz,
- GraphicObject& rObj,
+ GraphicObject const & rObj,
const GraphicAttr& rAttr,
bool& rCached
);
@@ -589,7 +589,7 @@ public:
void SetCacheTimeout( sal_uLong nTimeoutSeconds );
bool IsInCache(
- OutputDevice* pOut,
+ OutputDevice const * pOut,
const Point& rPt,
const Size& rSz,
const GraphicObject& rObj,
@@ -600,7 +600,7 @@ public:
OutputDevice* pOut,
const Point& rPt,
const Size& rSz,
- GraphicObject& rObj,
+ GraphicObject const & rObj,
const GraphicAttr& rAttr,
const GraphicManagerDrawFlags nFlags,
bool& rCached
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 58bada8fadd2..1c37552e87c1 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -70,7 +70,7 @@ class SVT_DLLPUBLIC SvPasteObjectHelper
{
public:
static OUString GetSotFormatUIName( SotClipboardFormatId nId );
- static bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotClipboardFormatId& _nFormat);
+ static bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotClipboardFormatId const & _nFormat);
};
#endif // INCLUDED_SVTOOLS_INSDLG_HXX
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 93b851b88d7a..3cb0171f35cf 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -206,11 +206,11 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual void RequestHelp( const HelpEvent& rHEvt ) override;
static void DrawEntryImage(
- SvxIconChoiceCtrlEntry* pEntry,
+ SvxIconChoiceCtrlEntry const * pEntry,
const Point& rPos,
OutputDevice& rDev );
- static OUString GetEntryText( SvxIconChoiceCtrlEntry* pEntry );
+ static OUString GetEntryText( SvxIconChoiceCtrlEntry const * pEntry );
virtual void FillLayoutData() const override;
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 8b070b15107a..8ffa953ad58c 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -226,7 +226,7 @@ public:
// Determine the options. pNoConvertToken is the optional token
// of an option, for which the CR/LFs are not deleted from the value
// of the option.
- const HTMLOptions& GetOptions( HtmlOptionId *pNoConvertToken=nullptr );
+ const HTMLOptions& GetOptions( HtmlOptionId const *pNoConvertToken=nullptr );
// for asynchronous reading from the SvStream
virtual void Continue( HtmlTokenId nToken ) override;
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index 0380b3fe1afa..f9ee89f0cec9 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -106,7 +106,7 @@ namespace svt
*/
virtual void SAL_CALL disposing() override;
- static void resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ static void resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
virtual void impl_setPopupMenu();
static OUString determineBaseURL( const OUString& aURL );
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 383c718bd97a..64c2ed5d4d7e 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -75,10 +75,10 @@ public:
void ImplFillPrnDlgListBox( const Printer* pPrinter,
ListBox* pBox, PushButton* pPropBtn );
void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear = true );
-Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
- Printer* pPrinter, Printer* pTempPrinter );
-Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter );
-void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo );
+Printer* ImplPrnDlgListBoxSelect( ListBox const * pBox, PushButton* pPropBtn,
+ Printer const * pPrinter, Printer* pTempPrinter );
+Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinter );
+void ImplPrnDlgUpdateQueueInfo( ListBox const * pBox, QueueInfo& rInfo );
OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo );
#endif // INCLUDED_SVTOOLS_PRNSETUP_HXX
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index f1e1a3b6c4db..e95febf8fabd 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -682,7 +682,7 @@ private:
SVT_DLLPRIVATE void ImplInit( WinBits nWinBits );
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SVT_DLLPRIVATE void ImplCalc();
- SVT_DLLPRIVATE void ImplFormat(vcl::RenderContext& rRenderContext);
+ SVT_DLLPRIVATE void ImplFormat(vcl::RenderContext const & rRenderContext);
SVT_DLLPRIVATE void ImplInitExtraField( bool bUpdate );
SVT_DLLPRIVATE void ImplInvertLines(vcl::RenderContext& rRenderContext);
SVT_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx
index c241e19a7500..20dc592596e5 100644
--- a/include/svtools/sampletext.hxx
+++ b/include/svtools/sampletext.hxx
@@ -24,12 +24,12 @@ SVT_DLLPUBLIC UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCovera
SVT_DLLPUBLIC bool isSymbolFont(const vcl::Font &rFont);
SVT_DLLPUBLIC bool isOpenSymbolFont(const vcl::Font &rFont);
-SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice &rDevice);
+SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice const &rDevice);
//These ones are typically for use in the font dropdown box beside the
//fontname, so say things roughly like "Script/Alphabet/Name-Of-Major-Language"
-SVT_DLLPUBLIC OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice);
-SVT_DLLPUBLIC OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice);
+SVT_DLLPUBLIC OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const &rDevice);
+SVT_DLLPUBLIC OUString makeShortRepresentativeTextForSelectedFont(OutputDevice const &rDevice);
SVT_DLLPUBLIC OUString makeShortRepresentativeTextForScript(UScriptCode eScript);
//For the cases where the font doesn't fully support a script, but has partial support
//for a useful subset
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 7d11eba55348..7b8d6cd0f46e 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -62,7 +62,7 @@ public:
The font for asian characters.
@param _pCmplxFont
The font for complex text layout. */
- void SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont );
+ void SetFonts( vcl::Font const * _pLatinFont, vcl::Font const * _pAsianFont, vcl::Font const * _pCmplxFont );
/** Sets the default font of the current output device to all script types. */
void SetDefaultFont();
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 2e3b7da0245c..2fbe1e6e9cf8 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -140,7 +140,7 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
SvLBoxButtonKind eKind;
SvItemStateFlags nItemFlags;
- static void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::RenderContext& pRenderContext);
+ static void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::RenderContext const & pRenderContext);
public:
// An SvLBoxButton can be of three different kinds: an
// enabled checkbox (the normal kind), a disabled checkbox
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 2faa184d7643..5ab0df9fca01 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -178,7 +178,7 @@ public:
/** Assignment.
*/
- SvKeyValue& operator= (SvKeyValue &rOther)
+ SvKeyValue& operator= (SvKeyValue const &rOther)
{
m_aKey = rOther.m_aKey;
m_aValue = rOther.m_aValue;
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 5c1df4059909..e652aa9c9a51 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -154,7 +154,7 @@ public:
sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = nullptr ) override;
virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND) override;
virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ) override;
- void RemoveEntry( SvTreeListEntry* _pEntry );
+ void RemoveEntry( SvTreeListEntry const * _pEntry );
void Clear();
// Accessible -------------------------------------------------------------
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 3135bf2a7f8d..5f990ef0dcad 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -126,7 +126,7 @@ private:
void appendEntry(std::unique_ptr<ToolbarMenuEntry> pEntry);
- void implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry* pThisOnly = nullptr, bool bHighlight = false);
+ void implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry const * pThisOnly = nullptr, bool bHighlight = false);
void implHighlightEntry(vcl::RenderContext& rRenderContext, int nHighlightEntry);
void implHighlightAtPosition(const MouseEvent& rMEvt);
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 01ed48aeae7a..483575b01c6b 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -91,7 +91,7 @@ class SVT_DLLPUBLIC SvTreeList final
bool IsEntryVisible( const SvListView*,SvTreeListEntry* pEntry ) const;
SvTreeListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const;
- sal_uLong GetVisiblePos( const SvListView*,SvTreeListEntry* pEntry ) const;
+ sal_uLong GetVisiblePos( const SvListView*,SvTreeListEntry const * pEntry ) const;
sal_uLong GetVisibleCount( SvListView* ) const;
sal_uLong GetVisibleChildCount( const SvListView*,SvTreeListEntry* pParent ) const;
@@ -120,7 +120,7 @@ class SVT_DLLPUBLIC SvTreeList final
// rPos is not changed for SortModeNone
SVT_DLLPRIVATE void GetInsertionPos(
- SvTreeListEntry* pEntry,
+ SvTreeListEntry const * pEntry,
SvTreeListEntry* pParent,
sal_uLong& rPos
);
@@ -139,7 +139,7 @@ public:
~SvTreeList();
void InsertView( SvListView* );
- void RemoveView( SvListView* );
+ void RemoveView( SvListView const * );
void Broadcast(
SvListAction nActionId,
@@ -299,10 +299,10 @@ public:
SvTreeListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const
{ return pModel->GetEntryAtVisPos(this,nVisPos); }
- sal_uLong GetAbsPos( SvTreeListEntry* pEntry ) const
+ sal_uLong GetAbsPos( SvTreeListEntry const * pEntry ) const
{ return pModel->GetAbsPos(pEntry); }
- sal_uLong GetVisiblePos( SvTreeListEntry* pEntry ) const
+ sal_uLong GetVisiblePos( SvTreeListEntry const * pEntry ) const
{ return pModel->GetVisiblePos(this,pEntry); }
sal_uLong GetVisibleChildCount(SvTreeListEntry* pParent ) const
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 3558842ae217..326cb6abf581 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -284,7 +284,7 @@ private:
protected:
- bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 );
+ bool CheckDragAndDropMode( SvTreeListBox const * pSource, sal_Int8 );
void ImplShowTargetEmphasis( SvTreeListEntry* pEntry, bool bShow);
void EnableSelectionAsDropTarget( bool bEnable = true );
// Standard impl returns 0; derived classes which support D'n'D must override
@@ -381,7 +381,7 @@ public:
/**
* Removes the entry along with all of its descendants
*/
- void RemoveEntry(SvTreeListEntry* pEntry);
+ void RemoveEntry(SvTreeListEntry const * pEntry);
DragDropMode GetDragDropMode() const { return nDragDropMode; }
SelectionMode GetSelectionMode() const { return eSelMode; }
@@ -399,11 +399,11 @@ public:
SvTreeListEntry* GetRootLevelParent(SvTreeListEntry* pEntry ) const;
using Window::GetChildCount;
- sal_uLong GetChildCount( SvTreeListEntry* pParent ) const;
+ sal_uLong GetChildCount( SvTreeListEntry const * pParent ) const;
sal_uLong GetLevelChildCount( SvTreeListEntry* pParent ) const;
- SvViewDataEntry* GetViewDataEntry( SvTreeListEntry* pEntry ) const;
- SvViewDataItem* GetViewDataItem(SvTreeListEntry*, SvLBoxItem*);
+ SvViewDataEntry* GetViewDataEntry( SvTreeListEntry const * pEntry ) const;
+ SvViewDataItem* GetViewDataItem(SvTreeListEntry const *, SvLBoxItem const *);
const SvViewDataItem* GetViewDataItem(const SvTreeListEntry*, const SvLBoxItem*) const;
bool IsInplaceEditingEnabled() const { return bool(nImpFlags & SvTreeListBoxFlags::EDT_ENABLED); }
@@ -535,7 +535,7 @@ protected:
SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);
- SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry* pEntry );
+ SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry const * pEntry );
SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp );
SVT_DLLPRIVATE void AdjustEntryHeight();
@@ -562,7 +562,7 @@ protected:
SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const;
SvLBoxTab* GetFirstTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos );
void GetLastTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos );
- SvLBoxTab* GetTab( SvTreeListEntry*, SvLBoxItem* ) const;
+ SvLBoxTab* GetTab( SvTreeListEntry const *, SvLBoxItem const * ) const;
void ClearTabList();
virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 3a5d64afe92e..cea3251174bf 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -246,7 +246,7 @@ private:
SVT_DLLPRIVATE void ImplInitScrollBar();
SVT_DLLPRIVATE void ImplDeleteItems();
- SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect);
+ SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect);
SVT_DLLPRIVATE void ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rStr);
SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel);
SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext);
@@ -376,7 +376,7 @@ public:
void SetExtraSpacing( sal_uInt16 nNewSpacing );
- void Format(vcl::RenderContext& rRenderContext);
+ void Format(vcl::RenderContext const & rRenderContext);
void SetFormat();
void StartSelection();
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index bfd80a724015..6a354a39fe80 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -348,7 +348,7 @@ namespace svt
DECL_DLLPRIVATE_LINK(OnPrevPage, Button*, void);
DECL_DLLPRIVATE_LINK(OnFinish, Button*, void);
- SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow);
+ SVT_DLLPRIVATE void implResetDefault(vcl::Window const * _pWindow);
SVT_DLLPRIVATE void implUpdateTitle();
SVT_DLLPRIVATE void implConstruct( const WizardButtonFlags _nButtonFlags );
};
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index ceae5b7ea9e9..193ceac94060 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -104,7 +104,7 @@ private:
void DeselectOldRoadmapItems();
ItemId GetNextAvailableItemId( ItemIndex NewIndex );
ItemId GetPreviousAvailableItemId( ItemIndex NewIndex );
- RoadmapItem* GetByPointer(vcl::Window* pWindow);
+ RoadmapItem* GetByPointer(vcl::Window const * pWindow);
RoadmapItem* InsertHyperLabel( ItemIndex Index, const OUString& _aStr, ItemId RMID, bool _bEnabled, bool _bIncomplete );
void UpdatefollowingHyperLabels( ItemIndex Index );
};
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 1745d1920fbc..ee823e22ba60 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1023,7 +1023,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
_rOut.SetLineColor( aOldLineColor );
}
-void BrowseBox::PaintData( vcl::Window& rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect )
+void BrowseBox::PaintData( vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect )
{
if (!bBootstrapped && IsReallyVisible())
BrowseBox::StateChanged(StateChangedType::InitShow);
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 75d2086d3348..9748be9a6b76 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -44,7 +44,7 @@ namespace svt
AccessibleBrowseBoxObjType _eType,
const Reference< XAccessible >& _rParent,
BrowseBox& _rBrowseBox,
- IAccessibleFactory& rFactory
+ IAccessibleFactory const & rFactory
)
{
Reference< XAccessible > xRet;
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index c9d1c2e86cf0..c47e69729ffe 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -126,7 +126,7 @@ void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZ
}
}
-void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos )
+void BrowserColumn::Draw( BrowseBox const & rBox, OutputDevice& rDev, const Point& rPos )
{
if ( _nId == 0 )
{
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index f9cc4ce3f5f8..c89b45457c5e 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -77,7 +77,7 @@ public:
bool IsFrozen() const { return _bFrozen; }
void Freeze() { _bFrozen = true; }
- void Draw( BrowseBox& rBox, OutputDevice& rDev,
+ void Draw( BrowseBox const & rBox, OutputDevice& rDev,
const Point& rPos );
void SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom);
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 2c6842681b36..c4d94dc5a7dd 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1132,7 +1132,7 @@ namespace svt
}
- void EditBrowseBox::ResizeController(CellControllerRef& rController, const tools::Rectangle& rRect)
+ void EditBrowseBox::ResizeController(CellControllerRef const & rController, const tools::Rectangle& rRect)
{
rController->GetWindow().SetPosSizePixel(rRect.TopLeft(), rRect.GetSize());
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index b711fff48d79..a85e6d1d392d 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1007,7 +1007,7 @@ void SvtFileView::SetViewMode( FileViewMode eMode )
mpImpl->SetViewMode( eMode );
}
-OUString SvtFileView::GetURL( SvTreeListEntry* pEntry )
+OUString SvtFileView::GetURL( SvTreeListEntry const * pEntry )
{
OUString aURL;
if ( pEntry && pEntry->GetUserData() )
@@ -1959,7 +1959,7 @@ static const CollatorWrapper* pCollatorWrapper = nullptr;
/* this function returns true, if aOne is less then aTwo
*/
-bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl* const aTwo )
+bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl const * aTwo )
{
DBG_ASSERT( pCollatorWrapper, "*CompareSortingData_Impl(): Can't work this way!" );
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 8064b0ec4481..1684d2290836 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -237,7 +237,7 @@ class SvxIconChoiceCtrl_Impl
}
void InitScrollBarBox();
void ToggleSelection( SvxIconChoiceCtrlEntry* );
- void DeselectAllBut( SvxIconChoiceCtrlEntry* );
+ void DeselectAllBut( SvxIconChoiceCtrlEntry const * );
void Center( SvxIconChoiceCtrlEntry* pEntry ) const;
void StopEditTimer() { aEditIdle.Stop(); }
void StartEditTimer() { aEditIdle.Start(); }
@@ -291,7 +291,7 @@ class SvxIconChoiceCtrl_Impl
DECL_LINK(TextEditEndedHdl, LinkParamNone*, void);
- void ShowFocus ( tools::Rectangle& rRect );
+ void ShowFocus ( tools::Rectangle const & rRect );
void DrawFocusRect(vcl::RenderContext& rRenderContext);
bool IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 53bd13e4cf2e..0147ef4f8527 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2263,7 +2263,7 @@ void SvxIconChoiceCtrl_Impl::ToggleSelection( SvxIconChoiceCtrlEntry* pEntry )
SelectEntry( pEntry, bSel, true );
}
-void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryNot )
+void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry const * pThisEntryNot )
{
ClearSelectedRectList();
@@ -2708,7 +2708,7 @@ void SvxIconChoiceCtrl_Impl::SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode,
// of the background. But what will we see, if the backgroundcolor is gray ? - We will see
// a gray focusrect on a gray background !!!
-void SvxIconChoiceCtrl_Impl::ShowFocus ( tools::Rectangle& rRect )
+void SvxIconChoiceCtrl_Impl::ShowFocus ( tools::Rectangle const & rRect )
{
Color aBkgColor(pView->GetBackground().GetColor());
Color aPenColor;
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 5eef13d45aa5..f1796d5704ac 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -101,12 +101,12 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, c
return pEntry;
}
-void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
+void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry const * pEntry, const Point& rPos, OutputDevice& rDev )
{
rDev.DrawImage( rPos, pEntry->GetImage() );
}
-OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry const * pEntry )
{
return pEntry->GetText();
}
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 06a10fbf7956..7d8e130b1db1 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -154,7 +154,7 @@ void SvImpLBox::UpdateStringSorter()
}
}
-short SvImpLBox::UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth )
+short SvImpLBox::UpdateContextBmpWidthVector( SvTreeListEntry const * pEntry, short nWidth )
{
DBG_ASSERT( pView->pModel, "View and Model aren't valid!" );
@@ -204,7 +204,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEnt
}
}
-void SvImpLBox::UpdateContextBmpWidthMax( SvTreeListEntry* pEntry )
+void SvImpLBox::UpdateContextBmpWidthMax( SvTreeListEntry const * pEntry )
{
sal_uInt16 nDepth = pView->pModel->GetDepth( pEntry );
if( aContextBmpWidthVector.size() < 1 )
@@ -218,7 +218,7 @@ void SvImpLBox::UpdateContextBmpWidthMax( SvTreeListEntry* pEntry )
}
}
-void SvImpLBox::CalcCellFocusRect( SvTreeListEntry* pEntry, tools::Rectangle& rRect )
+void SvImpLBox::CalcCellFocusRect( SvTreeListEntry const * pEntry, tools::Rectangle& rRect )
{
if ( pEntry && bIsCellFocusEnabled )
{
@@ -1878,7 +1878,7 @@ bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pE
return false;
}
-bool SvImpLBox::MouseMoveCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry)
+bool SvImpLBox::MouseMoveCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry const * pEntry)
{
if( pActiveButton )
{
@@ -3151,7 +3151,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
return false;
}
-SvLBoxTab* SvImpLBox::NextTab( SvLBoxTab* pTab )
+SvLBoxTab* SvImpLBox::NextTab( SvLBoxTab const * pTab )
{
sal_uInt16 nTabCount = pView->TabCount();
if( nTabCount <= 1 )
@@ -3222,7 +3222,7 @@ bool SvImpLBox::SetMostRight( SvTreeListEntry* pEntry )
return false;
}
-void SvImpLBox::FindMostRight( SvTreeListEntry* pEntryToIgnore )
+void SvImpLBox::FindMostRight( SvTreeListEntry const * pEntryToIgnore )
{
nMostRight = -1;
pMostRightEntry = nullptr;
@@ -3374,7 +3374,7 @@ bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry )
{
if( pEntry )
{
- SvViewDataEntry* pViewDataNewCur = pView->GetViewDataEntry(const_cast<SvTreeListEntry*>(pEntry));
+ SvViewDataEntry* pViewDataNewCur = pView->GetViewDataEntry(pEntry);
return (pViewDataNewCur == nullptr) || pViewDataNewCur->IsSelectable();
}
else
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index fae3dd1e2273..78a74272eb1e 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -315,7 +315,7 @@ void SvLBoxButton::Clone( SvLBoxItem* pSource )
pData = static_cast<SvLBoxButton*>(pSource)->pData;
}
-void SvLBoxButton::ImplAdjustBoxSize(Size& io_rSize, ControlType i_eType, vcl::RenderContext& rRenderContext)
+void SvLBoxButton::ImplAdjustBoxSize(Size& io_rSize, ControlType i_eType, vcl::RenderContext const & rRenderContext)
{
if (rRenderContext.IsNativeControlSupported( i_eType, ControlPart::Entire) )
{
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index ccf870e5dd58..93fb4403e007 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -583,7 +583,7 @@ sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPo
return nPos;
}
-void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry )
+void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry const * _pEntry )
{
GetModel()->Remove( _pEntry );
m_aAccessibleChildren.clear();
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 6315237e7a9b..7d47e4b5535a 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -102,7 +102,7 @@ void SvTreeList::InsertView( SvListView* pView )
nRefCount++;
}
-void SvTreeList::RemoveView( SvListView* pView )
+void SvTreeList::RemoveView( SvListView const * pView )
{
for ( ListViewsType::iterator it = aViewList.begin(); it != aViewList.end(); ++it )
{
@@ -602,7 +602,7 @@ SvTreeListEntry* SvTreeList::Last() const
return pEntry;
}
-sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry* pEntry ) const
+sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry const * pEntry ) const
{
DBG_ASSERT(pView&&pEntry,"View/Entry?");
@@ -1586,7 +1586,7 @@ void SvTreeList::ReverseChildren( SvTreeListEntry* pParent )
SetListPositions(pParent->m_Children); // correct list position in target list
}
-void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* pParent,
+void SvTreeList::GetInsertionPos( SvTreeListEntry const * pEntry, SvTreeListEntry* pParent,
sal_uLong& rPos )
{
DBG_ASSERT(pEntry,"No Entry");
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index bd8fab1f837d..cf5e9a2aa05d 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -431,7 +431,7 @@ bool SvTreeListBox::DoubleClickHdl()
}
-bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nAction )
+bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox const * pSource, sal_Int8 nAction )
{
if ( pSource == this )
{
@@ -673,7 +673,7 @@ void SvTreeListBox::RemoveSelection()
pModel->Remove(*it);
}
-void SvTreeListBox::RemoveEntry(SvTreeListEntry* pEntry)
+void SvTreeListBox::RemoveEntry(SvTreeListEntry const * pEntry)
{
pModel->Remove(pEntry);
}
@@ -786,7 +786,7 @@ SvTreeListEntry* SvTreeListBox::GetRootLevelParent( SvTreeListEntry* pEntry ) co
return pModel->GetRootLevelParent(pEntry);
}
-sal_uLong SvTreeListBox::GetChildCount( SvTreeListEntry* pParent ) const
+sal_uLong SvTreeListBox::GetChildCount( SvTreeListEntry const * pParent ) const
{
return pModel->GetChildCount(pParent);
}
@@ -806,12 +806,12 @@ sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const
return _pParent->m_Children.size();
}
-SvViewDataEntry* SvTreeListBox::GetViewDataEntry( SvTreeListEntry* pEntry ) const
+SvViewDataEntry* SvTreeListBox::GetViewDataEntry( SvTreeListEntry const * pEntry ) const
{
return const_cast<SvViewDataEntry*>(SvListView::GetViewData(pEntry));
}
-SvViewDataItem* SvTreeListBox::GetViewDataItem(SvTreeListEntry* pEntry, SvLBoxItem* pItem)
+SvViewDataItem* SvTreeListBox::GetViewDataItem(SvTreeListEntry const * pEntry, SvLBoxItem const * pItem)
{
return const_cast<SvViewDataItem*>(static_cast<const SvTreeListBox*>(this)->GetViewDataItem(pEntry, pItem));
}
@@ -2138,7 +2138,7 @@ short SvTreeListBox::GetHeightOffset(const Image& rBmp, Size& aSizeLogic )
return nOffset;
}
-void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry )
+void SvTreeListBox::SetEntryHeight( SvTreeListEntry const * pEntry )
{
short nHeightMax=0;
sal_uInt16 nCount = pEntry->ItemCount();
@@ -3295,7 +3295,7 @@ SvLBoxTab* SvTreeListBox::GetFirstDynamicTab() const
return GetFirstDynamicTab( nDummy );
}
-SvLBoxTab* SvTreeListBox::GetTab( SvTreeListEntry* pEntry, SvLBoxItem* pItem) const
+SvLBoxTab* SvTreeListBox::GetTab( SvTreeListEntry const * pEntry, SvLBoxItem const * pItem) const
{
sal_uInt16 nPos = pEntry->GetPos( pItem );
return aTabs[ nPos ];
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 3adf8c22f3f8..7bf29c78f604 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -857,7 +857,7 @@ void FontNameBox::ImplCalcUserItemSize()
namespace
{
- long shrinkFontToFit(OUString &rSampleText, long nH, vcl::Font &rFont, OutputDevice &rDevice, tools::Rectangle &rTextRect)
+ long shrinkFontToFit(OUString const &rSampleText, long nH, vcl::Font &rFont, OutputDevice &rDevice, tools::Rectangle &rTextRect)
{
long nWidth = 0;
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 11d6d69ba65a..df8390db6a65 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -568,7 +568,7 @@ OUString FontList::GetFontMapText( const FontMetric& rInfo ) const
namespace
{
- FontMetric makeMissing(ImplFontListFontMetric* pFontNameInfo, const OUString &rName,
+ FontMetric makeMissing(ImplFontListFontMetric const * pFontNameInfo, const OUString &rName,
FontWeight eWeight, FontItalic eItalic)
{
FontMetric aInfo;
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index eb52f8604a9a..5b0fb828986d 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -462,7 +462,7 @@ void FormattedField::Modify()
impl_Modify();
}
-void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel)
+void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection const * pNewSel)
{
if (m_bAutoColor)
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index fcc03d131fb4..c6e60546c5ca 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -63,7 +63,7 @@ public:
void Update( ItemIndex RMIndex, const OUString& _rText );
- void SetPosition( RoadmapItem* OldHyperLabel );
+ void SetPosition( RoadmapItem const * OldHyperLabel );
void ToggleBackgroundColor( const Color& _rGBColor );
void SetInteractive( bool _bInteractive );
@@ -583,7 +583,7 @@ void ORoadmap::DrawHeadline(vcl::RenderContext& rRenderContext)
rRenderContext.SetTextColor(rStyleSettings.GetFieldTextColor());
}
-RoadmapItem* ORoadmap::GetByPointer(vcl::Window* pWindow)
+RoadmapItem* ORoadmap::GetByPointer(vcl::Window const * pWindow)
{
const HL_Vector& rItems = m_pImpl->getHyperLabels();
for ( HL_Vector::const_iterator i = rItems.begin();
@@ -737,7 +737,7 @@ RoadmapTypes::ItemIndex RoadmapItem::GetIndex() const
return mpDescription ? mpDescription->GetIndex() : ItemIndex(-1);
}
-void RoadmapItem::SetPosition(RoadmapItem* _pOldItem)
+void RoadmapItem::SetPosition(RoadmapItem const * _pOldItem)
{
Point aIDPos;
if ( _pOldItem == nullptr )
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 758df8a09a89..3039ea74f74a 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1059,7 +1059,7 @@ void Ruler::ImplCalc()
mbCalc = false;
}
-void Ruler::ImplFormat(vcl::RenderContext& rRenderContext)
+void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext)
{
// if already formatted, don't do it again
if (!mbFormat)
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index a8495d725605..c077786e20e0 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -71,7 +71,7 @@ public:
const SvtScriptedTextHelper_Impl& _rCopy );
/** Sets new fonts and recalculates the text width. */
- void SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont );
+ void SetFonts( vcl::Font const * _pLatinFont, vcl::Font const * _pAsianFont, vcl::Font const * _pCmplxFont );
/** Sets a new text and calculates all script breaks and the text width. */
void SetText(
const OUString& _rText,
@@ -242,7 +242,7 @@ void SvtScriptedTextHelper_Impl::CalculateBreaks( const uno::Reference< i18n::XB
CalculateSizes();
}
-void SvtScriptedTextHelper_Impl::SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont )
+void SvtScriptedTextHelper_Impl::SetFonts( vcl::Font const * _pLatinFont, vcl::Font const * _pAsianFont, vcl::Font const * _pCmplxFont )
{
maLatinFont = _pLatinFont ? *_pLatinFont : maDefltFont;
maAsianFont = _pAsianFont ? *_pAsianFont : maDefltFont;
@@ -304,7 +304,7 @@ SvtScriptedTextHelper::~SvtScriptedTextHelper()
{
}
-void SvtScriptedTextHelper::SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont )
+void SvtScriptedTextHelper::SetFonts( vcl::Font const * _pLatinFont, vcl::Font const * _pAsianFont, vcl::Font const * _pCmplxFont )
{
mpImpl->SetFonts( _pLatinFont, _pAsianFont, _pCmplxFont );
}
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 88d6074d194b..41ffdcd9319e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -233,7 +233,7 @@ struct ImplTabBarItem
return maTabBgColor == Color(COL_AUTO);
}
- bool IsSelected(ImplTabBarItem* pCurItem) const
+ bool IsSelected(ImplTabBarItem const * pCurItem) const
{
return mbSelect || (pCurItem == this);
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 33df12a8b6d8..b48c79a64811 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -262,7 +262,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index )
}
-Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex )
+Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control const * pControl, sal_Int32 childIndex )
{
for( const auto& pEntry : maEntryVector )
{
@@ -513,7 +513,7 @@ void ToolbarMenu::initWindow()
}
-static long ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth )
+static long ImplGetNativeCheckAndRadioSize(vcl::RenderContext const & rRenderContext, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth )
{
rMaxWidth = rCheckHeight = rRadioHeight = 0;
@@ -1136,7 +1136,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent )
}
-static void ImplPaintCheckBackground(vcl::RenderContext& rRenderContext, vcl::Window& rWindow, const tools::Rectangle& i_rRect, bool i_bHighlight )
+static void ImplPaintCheckBackground(vcl::RenderContext& rRenderContext, vcl::Window const & rWindow, const tools::Rectangle& i_rRect, bool i_bHighlight )
{
bool bNativeOk = false;
if (rRenderContext.IsNativeControlSupported(ControlType::Toolbar, ControlPart::Button))
@@ -1158,7 +1158,7 @@ static void ImplPaintCheckBackground(vcl::RenderContext& rRenderContext, vcl::Wi
}
}
-void ToolbarMenu::implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry* pThisOnly, bool bHighlighted)
+void ToolbarMenu::implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry const * pThisOnly, bool bHighlighted)
{
long nFontHeight = GetTextHeight();
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index b119f6a5b0d0..9fc1736b4752 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -272,7 +272,7 @@ struct ToolbarMenu_Impl
css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index );
/// @throws css::lang::IndexOutOfBoundsException
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex );
+ css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control const * pControl, sal_Int32 childIndex );
/// @throws css::lang::IndexOutOfBoundsException
/// @throws css::uno::RuntimeException
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index b336aeb36850..269ad084b042 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -201,7 +201,7 @@ void ValueSet::ImplInitScrollBar()
}
}
-void ValueSet::ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect)
+void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect)
{
WinBits nStyle = GetStyle();
if (nStyle & WB_ITEMBORDER)
@@ -347,7 +347,7 @@ Reference<XAccessible> ValueSet::CreateAccessible()
return new ValueSetAcc( this );
}
-void ValueSet::Format(vcl::RenderContext& rRenderContext)
+void ValueSet::Format(vcl::RenderContext const & rRenderContext)
{
Size aWinSize(GetOutputSizePixel());
size_t nItemCount = mItemList.size();
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index cd61d236de95..003656ca0b67 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -285,7 +285,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId )
return aUIName;
}
-bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotClipboardFormatId& _nFormat)
+bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotClipboardFormatId const & _nFormat)
{
bool bRet = false;
if( _nFormat == SotClipboardFormatId::EMBED_SOURCE_OLE || _nFormat == SotClipboardFormatId::EMBEDDED_OBJ_OLE )
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index aa805f9e886c..37d6cd901c6b 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -49,8 +49,8 @@ void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear )
}
-Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
- Printer* pPrinter, Printer* pTempPrinterIn )
+Printer* ImplPrnDlgListBoxSelect( ListBox const * pBox, PushButton* pPropBtn,
+ Printer const * pPrinter, Printer* pTempPrinterIn )
{
VclPtr<Printer> pTempPrinter( pTempPrinterIn );
if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
@@ -88,7 +88,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
}
-Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn )
+Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinterIn )
{
VclPtr<Printer> pTempPrinter( pTempPrinterIn );
OUString aPrnName;
@@ -107,7 +107,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn )
}
-void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo )
+void ImplPrnDlgUpdateQueueInfo( ListBox const * pBox, QueueInfo& rInfo )
{
if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 1859e9f007db..b6fec0147f4a 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -306,7 +306,7 @@ namespace svt
}
- void OWizardMachine::implResetDefault(vcl::Window* _pWindow)
+ void OWizardMachine::implResetDefault(vcl::Window const * _pWindow)
{
vcl::Window* pChildLoop = _pWindow->GetWindow(GetWindowType::FirstChild);
while (pChildLoop)
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 6945de277d98..7684a08a1260 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -407,7 +407,7 @@ private:
DrawModeFlags mnOutDevDrawMode;
sal_uInt16 mnOutDevBitCount;
- static bool IsCacheableAsBitmap( const GDIMetaFile& rMtf, OutputDevice* pOut, const Size& rSz );
+ static bool IsCacheableAsBitmap( const GDIMetaFile& rMtf, OutputDevice const * pOut, const Size& rSz );
// Copy assignment is forbidden and not implemented.
GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) = delete;
@@ -415,7 +415,7 @@ private:
public:
- static sal_uLong GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+ static sal_uLong GetNeededSize( OutputDevice const * pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr );
public:
@@ -455,7 +455,7 @@ public:
void SetReleaseTime( const ::salhelper::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; }
const ::salhelper::TTimeValue& GetReleaseTime() const { return maReleaseTime; }
- bool Matches( OutputDevice* pOut, const Point& /*rPtPixel*/, const Size& rSzPixel,
+ bool Matches( OutputDevice const * pOut, const Point& /*rPtPixel*/, const Size& rSzPixel,
const GraphicCacheEntry* pCacheEntry, const GraphicAttr& rAttr ) const
{
// #i46805# Additional match
@@ -510,7 +510,7 @@ static void checkMetadataBitmap( const BitmapEx& rBmpEx,
// ImplCreateOutput() would use the optimization of using the single bitmap.
// If you do changes here, change the original function too.
bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const GDIMetaFile& rMtf,
- OutputDevice* pOut, const Size& rSz )
+ OutputDevice const * pOut, const Size& rSz )
{
const Size aNewSize( rMtf.GetPrefSize() );
GDIMetaFile rOutMtf = rMtf;
@@ -757,7 +757,7 @@ bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const GDIMetaFile& rMtf,
return nNumBitmaps == 1 && !bNonBitmapActionEncountered;
}
-sal_uLong GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& /*rPt*/, const Size& rSz,
+sal_uLong GraphicDisplayCacheEntry::GetNeededSize( OutputDevice const * pOut, const Point& /*rPt*/, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr )
{
const Graphic& rGraphic = rObj.GetGraphic();
@@ -1061,14 +1061,14 @@ void GraphicCache::SetCacheTimeout( sal_uLong nTimeoutSeconds )
}
}
-bool GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+bool GraphicCache::IsDisplayCacheable( OutputDevice const * pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr ) const
{
return( GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ) <=
GetMaxObjDisplayCacheSize() );
}
-bool GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+bool GraphicCache::IsInDisplayCache( OutputDevice const * pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr ) const
{
const Point aPtPixel( pOut->LogicToPixel( rPt ) );
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index 8db16aee1d52..4402573e84dc 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -91,7 +91,7 @@ public:
sal_uLong GetCacheTimeout() const { return mnReleaseTimeoutSeconds; }
bool IsDisplayCacheable(
- OutputDevice* pOut,
+ OutputDevice const * pOut,
const Point& rPt,
const Size& rSz,
const GraphicObject& rObj,
@@ -99,7 +99,7 @@ public:
) const;
bool IsInDisplayCache(
- OutputDevice* pOut,
+ OutputDevice const * pOut,
const Point& rPt,
const Size& rSz,
const GraphicObject& rObj,
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 0a1e4021e332..83b42ccfa2e4 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -231,7 +231,7 @@ void GraphicObject::ImplAutoSwapIn()
}
}
-bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
+bool GraphicObject::ImplGetCropParams( OutputDevice const * pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
tools::PolyPolygon& rClipPolyPoly, bool& bRectClipRegion ) const
{
bool bRet = false;
@@ -420,7 +420,7 @@ void GraphicObject::FireSwapOutRequest()
ImplAutoSwapOutHdl( nullptr );
}
-bool GraphicObject::IsCached( OutputDevice* pOut, const Size& rSz,
+bool GraphicObject::IsCached( OutputDevice const * pOut, const Size& rSz,
const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) const
{
bool bRet;
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 541f90ee69e5..b2efd6003b95 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -73,7 +73,7 @@ void GraphicManager::SetCacheTimeout( sal_uLong nTimeoutSeconds )
mpCache->SetCacheTimeout( nTimeoutSeconds );
}
-bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
+bool GraphicManager::IsInCache( OutputDevice const * pOut, const Point& rPt,
const Size& rSz, const GraphicObject& rObj,
const GraphicAttr& rAttr ) const
{
@@ -81,7 +81,7 @@ bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
}
bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
- GraphicObject& rObj, const GraphicAttr& rAttr,
+ GraphicObject const & rObj, const GraphicAttr& rAttr,
const GraphicManagerDrawFlags nFlags, bool& rCached )
{
Point aPt( rPt );
@@ -178,7 +178,7 @@ namespace
{
struct simpleSortByDataChangeTimeStamp
{
- bool operator() (GraphicObject* p1, GraphicObject* p2) const
+ bool operator() (GraphicObject const * p1, GraphicObject const * p2) const
{
return p1->GetDataChangeTimeStamp() < p2->GetDataChangeTimeStamp();
}
@@ -230,7 +230,7 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj )
}
bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
- const Size& rSz, GraphicObject& rObj,
+ const Size& rSz, GraphicObject const & rObj,
const GraphicAttr& rAttr,
bool& rCached )
{
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 44dc8de4981b..d8df2c321c89 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -485,7 +485,7 @@ uno::Sequence< uno::Reference<graphic::XGraphic> > SAL_CALL GraphicProvider::que
return comphelper::containerToSequence(aRet);
}
-void ImplCalculateCropRect( ::Graphic& rGraphic, const text::GraphicCrop& rGraphicCropLogic, tools::Rectangle& rGraphicCropPixel )
+void ImplCalculateCropRect( ::Graphic const & rGraphic, const text::GraphicCrop& rGraphicCropLogic, tools::Rectangle& rGraphicCropPixel )
{
if ( rGraphicCropLogic.Left || rGraphicCropLogic.Top || rGraphicCropLogic.Right || rGraphicCropLogic.Bottom )
{
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 9b2fc7f51c99..8213f3ebf207 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -170,13 +170,13 @@ private:
SvTreeListEntry* pNewCursor );
void BeginDrag();
bool ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry );
- bool MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry );
+ bool MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry const * pEntry );
bool ButtonUpCheckCtrl( const MouseEvent& rMEvt );
bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry* );
bool EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPos, long nLine);
void InitScrollBarBox();
- SvLBoxTab* NextTab( SvLBoxTab* );
+ SvLBoxTab* NextTab( SvLBoxTab const * );
bool SetMostRight( SvTreeListEntry* pEntry );
void FindMostRight( SvTreeListEntry* pParent, SvTreeListEntry* EntryToIgnore );
@@ -190,11 +190,11 @@ private:
void UpdateStringSorter();
- short UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth );
- void UpdateContextBmpWidthMax( SvTreeListEntry* pEntry );
+ short UpdateContextBmpWidthVector( SvTreeListEntry const * pEntry, short nWidth );
+ void UpdateContextBmpWidthMax( SvTreeListEntry const * pEntry );
void UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry );
- void CalcCellFocusRect( SvTreeListEntry* pEntry, tools::Rectangle& rRect );
+ void CalcCellFocusRect( SvTreeListEntry const * pEntry, tools::Rectangle& rRect );
bool AreChildrenTransient() const { return bAreChildrenTransient; }
void SetChildrenNotTransient() { bAreChildrenTransient = false; }
@@ -231,7 +231,7 @@ protected:
void BeginScroll();
void EndScroll();
void PositionScrollBars( Size& rOSize, sal_uInt16 nMask );
- void FindMostRight( SvTreeListEntry* EntryToIgnore );
+ void FindMostRight( SvTreeListEntry const * EntryToIgnore );
void FillView();
void ShowVerSBar();
void StopUserEvent();
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index ae6bdf0c30c0..45de241940df 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -448,7 +448,7 @@ const Graphic* EmbeddedObjectRef::GetGraphic() const
return mpImpl->pGraphic.get();
}
-Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const
+Size EmbeddedObjectRef::GetSize( MapMode const * pTargetMapMode ) const
{
MapMode aSourceMapMode( MapUnit::Map100thMM );
Size aResult;
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 7a2db3986b8f..ba66d8310b8a 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -138,13 +138,13 @@ bool isSymbolFont(const vcl::Font &rFont)
IsStarSymbol(rFont.GetFamilyName());
}
-bool canRenderNameOfSelectedFont(OutputDevice &rDevice)
+bool canRenderNameOfSelectedFont(OutputDevice const &rDevice)
{
const vcl::Font &rFont = rDevice.GetFont();
return !isSymbolFont(rFont) && ( -1 == rDevice.HasGlyphs(rFont, rFont.GetFamilyName()) );
}
-OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice)
+OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const &rDevice)
{
if (rDevice.GetFont().GetFamilyName() == "Symbol")
{
@@ -1214,7 +1214,7 @@ namespace
namespace
{
- UScriptCode attemptToDisambiguateHan(UScriptCode eScript, OutputDevice &rDevice)
+ UScriptCode attemptToDisambiguateHan(UScriptCode eScript, OutputDevice const &rDevice)
{
//If we're a CJK font, see if we seem to be tuned for C, J or K
if (eScript == USCRIPT_HAN)
@@ -1257,7 +1257,7 @@ namespace
}
}
-OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
+OUString makeShortRepresentativeTextForSelectedFont(OutputDevice const &rDevice)
{
UScriptCode eScript = lcl_getHardCodedScriptNameForFont(rDevice);
if (eScript == USCRIPT_INVALID_CODE)
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 83769a80c68e..1f479973497e 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1357,7 +1357,7 @@ void HTMLParser::UnescapeToken()
}
}
-const HTMLOptions& HTMLParser::GetOptions( HtmlOptionId *pNoConvertToken )
+const HTMLOptions& HTMLParser::GetOptions( HtmlOptionId const *pNoConvertToken )
{
// If the options for the current token have already been returned,
// return them once again.
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 225aa304d2b5..67a2349eb13a 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -74,7 +74,7 @@ void PopupMenuControllerBase::throwIfDisposed()
}
// protected function
-void PopupMenuControllerBase::resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu )
+void PopupMenuControllerBase::resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
if ( rPopupMenu.is() && rPopupMenu->getItemCount() > 0 )
{
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index a0e0853a79fe..54e7d099ef77 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -168,7 +168,7 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry )
}
-void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry )
+void TreeControlPeer::removeEntry( UnoTreeListEntry const * pEntry )
{
if( mpTreeNodeMap && pEntry && pEntry->mxNode.is() )
{
@@ -894,7 +894,7 @@ void SAL_CALL TreeControlPeer::removeTreeEditListener( const Reference< XTreeEdi
maTreeEditListeners.removeInterface( xListener );
}
-bool TreeControlPeer::onEditingEntry( UnoTreeListEntry* pEntry )
+bool TreeControlPeer::onEditingEntry( UnoTreeListEntry const * pEntry )
{
if( mpTreeImpl && pEntry && pEntry->mxNode.is() && (maTreeEditListeners.getLength() > 0) )
{
@@ -913,7 +913,7 @@ bool TreeControlPeer::onEditingEntry( UnoTreeListEntry* pEntry )
return true;
}
-bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText )
+bool TreeControlPeer::onEditedEntry( UnoTreeListEntry const * pEntry, const OUString& rNewText )
{
if( mpTreeImpl && pEntry && pEntry->mxNode.is() ) try
{
@@ -999,7 +999,7 @@ void TreeControlPeer::updateTree( const css::awt::tree::TreeDataModelEvent& rEve
updateNode( rTree, xNode );
}
-void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode )
+void TreeControlPeer::updateNode( UnoTreeListBoxImpl const & rTree, const Reference< XTreeNode >& xNode )
{
if( xNode.is() )
{
@@ -1024,7 +1024,7 @@ void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XT
}
}
-void TreeControlPeer::updateChildNodes( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry )
+void TreeControlPeer::updateChildNodes( UnoTreeListBoxImpl const & rTree, const Reference< XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry )
{
if( xParentNode.is() && pParentEntry )
{
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 9a976f460d55..fc4b7e24348e 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -118,8 +118,8 @@ private:
void disposeControl();
- bool onEditingEntry( UnoTreeListEntry* pEntry );
- bool onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText );
+ bool onEditingEntry( UnoTreeListEntry const * pEntry );
+ bool onEditedEntry( UnoTreeListEntry const * pEntry, const OUString& rNewText );
void fillTree( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeDataModel >& xDataModel );
void addNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
@@ -128,8 +128,8 @@ private:
void updateEntry( UnoTreeListEntry* pEntry );
void updateTree( const css::awt::tree::TreeDataModelEvent& rEvent );
- void updateNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode );
- void updateChildNodes( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry );
+ void updateNode( UnoTreeListBoxImpl const & rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode );
+ void updateChildNodes( UnoTreeListBoxImpl const & rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry );
static OUString getEntryString( const css::uno::Any& rValue );
@@ -149,7 +149,7 @@ private:
void onChangeRootDisplayed( bool bIsRootDisplayed );
void addEntry( UnoTreeListEntry* pEntry );
- void removeEntry( UnoTreeListEntry* pEntry );
+ void removeEntry( UnoTreeListEntry const * pEntry );
bool loadImage( const OUString& rURL, Image& rImage );
More information about the Libreoffice-commits
mailing list