[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Aug 3 13:25:37 UTC 2017
reportdesign/inc/RptPage.hxx | 2 +-
reportdesign/inc/UndoEnv.hxx | 2 +-
reportdesign/source/core/api/ReportDefinition.cxx | 2 +-
reportdesign/source/core/sdr/RptPage.cxx | 2 +-
reportdesign/source/core/sdr/UndoEnv.cxx | 2 +-
reportdesign/source/ui/dlg/AddField.cxx | 2 +-
reportdesign/source/ui/inc/AddField.hxx | 2 +-
reportdesign/source/ui/inc/ReportWindow.hxx | 2 +-
reportdesign/source/ui/inc/ScrollHelper.hxx | 2 +-
reportdesign/source/ui/inc/UITools.hxx | 10 +++++-----
reportdesign/source/ui/inc/ViewsWindow.hxx | 4 ++--
reportdesign/source/ui/misc/UITools.cxx | 14 +++++++-------
reportdesign/source/ui/report/ReportController.cxx | 2 +-
reportdesign/source/ui/report/ReportWindow.cxx | 2 +-
reportdesign/source/ui/report/ScrollHelper.cxx | 2 +-
reportdesign/source/ui/report/ViewsWindow.cxx | 8 ++++----
16 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit b9e9dde5ae6f8955b5e6584dd5d809c98bb66814
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Aug 3 12:00:16 2017 +0200
loplugin:constparams in reportdesign
Change-Id: Ibbaca071e1279a7b5302207fe27e71d2994d6768
Reviewed-on: https://gerrit.libreoffice.org/40713
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 9d1f7f5c8c70..c168cd5f942f 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -45,7 +45,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
// method to remove temporary objects, created by 'special mode'
// (BegDragObj)
- void removeTempObject(SdrObject *_pToRemoveObj);
+ void removeTempObject(SdrObject const *_pToRemoveObj);
virtual ~OReportPage() override;
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 8a148d97610c..3741800d2617 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -105,7 +105,7 @@ namespace rptui
*
* \param _pPage
*/
- void RemoveSection(OReportPage* _pPage);
+ void RemoveSection(OReportPage const * _pPage);
protected:
// XEventListener
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 04f5a8b7679e..6602a665724d 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -191,7 +191,7 @@ namespace reportdesign
using namespace comphelper;
using namespace rptui;
-void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,std::shared_ptr<rptui::OReportModel>& _rModel)
+void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,std::shared_ptr<rptui::OReportModel> const & _rModel)
{
uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY);
sal_Int32 nOpenMode = embed::ElementModes::READ;
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 8fd6efa22b6a..f64808bb1ad6 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -146,7 +146,7 @@ uno::Reference< uno::XInterface > OReportPage::createUnoPage()
return static_cast<cppu::OWeakObject*>( new reportdesign::OReportDrawPage(this,m_xSection) );
}
-void OReportPage::removeTempObject(SdrObject *_pToRemoveObj)
+void OReportPage::removeTempObject(SdrObject const *_pToRemoveObj)
{
if (_pToRemoveObj)
{
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 38c03995ec8d..0f4a3c374973 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -138,7 +138,7 @@ void OXUndoEnvironment::UnLock()
}
bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; }
-void OXUndoEnvironment::RemoveSection(OReportPage* _pPage)
+void OXUndoEnvironment::RemoveSection(OReportPage const * _pPage)
{
if ( _pPage )
{
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index e08e89b8763b..8d884a4b10ec 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -380,7 +380,7 @@ uno::Reference< sdbc::XConnection> OAddFieldWindow::getConnection() const
return uno::Reference< sdbc::XConnection>(m_xRowSet->getPropertyValue( PROPERTY_ACTIVECONNECTION ),uno::UNO_QUERY);
}
-void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAccessDescriptor& _rDescriptor)
+void OAddFieldWindow::fillDescriptor(SvTreeListEntry const * _pSelected,svx::ODataAccessDescriptor& _rDescriptor)
{
if ( _pSelected && m_xColumns.is() )
{
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 89b4e795a0b3..42b4091c81e5 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -115,7 +115,7 @@ public:
* \param _pSelected the currently selected
* \param _rDescriptor the descriptor will be filled
*/
- void fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAccessDescriptor& _rDescriptor);
+ void fillDescriptor(SvTreeListEntry const * _pSelected,svx::ODataAccessDescriptor& _rDescriptor);
private:
// FmXChangeListener
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index f287eb1cca5a..efb776e20fab 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -173,7 +173,7 @@ namespace rptui
@param _pSectionView the section where to set the marked flag
@param _bMark the marked flag
*/
- void setMarked(OSectionView* _pSectionView, bool _bMark);
+ void setMarked(OSectionView const * _pSectionView, bool _bMark);
void setMarked(const css::uno::Reference< css::report::XSection>& _xSection, bool _bMark);
void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape, bool _bMark);
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index ddb3dd587e75..6ddcf52247ed 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -165,7 +165,7 @@ namespace rptui
@param _pSectionView the section where to set the marked flag
@param _bMark the marked flag
*/
- void setMarked(OSectionView* _pSectionView, bool _bMark);
+ void setMarked(OSectionView const * _pSectionView, bool _bMark);
void setMarked(const css::uno::Reference< css::report::XSection>& _xSection, bool _bMark);
void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape, bool _bMark);
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 2aa0b9f6fca0..c58354960c99 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -126,7 +126,7 @@ namespace rptui
::comphelper::mem_fun(&TaskPaneList::AddWindow)
::comphelper::mem_fun(&TaskPaneList::RemoveWindow)
*/
- void notifySystemWindow(vcl::Window* pWindow, vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc);
+ void notifySystemWindow(vcl::Window const * pWindow, vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc);
const sal_Int16 ISOVER_IGNORE_CUSTOMSHAPES = 1;
@@ -138,9 +138,9 @@ namespace rptui
* \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones
* \return the object which is overlapped, otherwise <NULL/>
*/
- SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects = false,SdrObject* _pIgnore = nullptr, sal_Int16 _nIgnoreType=0);
+ SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage const & _rPage,SdrView const & _rView,bool _bAllObjects = false,SdrObject const * _pIgnore = nullptr, sal_Int16 _nIgnoreType=0);
- SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects, SdrUnoObj* _pIgnoreList[], int _nIgnoreListLength);
+ SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage const & _rPage,SdrView const & _rView,bool _bAllObjects, SdrUnoObj* _pIgnoreList[], int _nIgnoreListLength);
/** checks whether the given OUnoObject object rectangle overlapps another object in that view.
*
@@ -149,7 +149,7 @@ namespace rptui
* \param _rView
* \return the object which is overlapped, otherwise <NULL/>. If the given object is not of type OUnoObject <NULL/> will be returned.
*/
- SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView);
+ SdrObject* isOver(SdrObject const * _pObj,SdrPage const & _rPage,SdrView const & _rView);
/** retrieves the names of the parameters of the command which the given RowSet is bound to
*/
@@ -162,7 +162,7 @@ namespace rptui
* \param _pReportSection the section
* \param _bInsert sal_True when the control should be inserted, otherwise not.
*/
- void correctOverlapping(SdrObject* pControl,OReportSection& _aReportSection,bool _bInsert = true);
+ void correctOverlapping(SdrObject* pControl,OReportSection const & _aReportSection,bool _bInsert = true);
/** returns a Rectangle of a given SdrObject
*
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 3c3dd882b3a9..50995a252113 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -187,7 +187,7 @@ namespace rptui
*
* @param _pSectionView The view where the objects should not be unmarked.
*/
- void unmarkAllObjects(OSectionView* _pSectionView);
+ void unmarkAllObjects(OSectionView const * _pSectionView);
/** returns the report section window for the given xsection
@param _xSection the section
@@ -204,7 +204,7 @@ namespace rptui
@param _pSectionView the section where to set the marked flag
@param _bMark the marked flag
*/
- void setMarked(OSectionView* _pSectionView, bool _bMark);
+ void setMarked(OSectionView const * _pSectionView, bool _bMark);
void setMarked(const css::uno::Reference< css::report::XSection>& _xSection, bool _bMark);
void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape, bool _bMark);
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 9d7a3eed25ad..a8b889df9752 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -831,7 +831,7 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat
}
}
-void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*>& rMemFunc)
+void notifySystemWindow(vcl::Window const * _pWindow, vcl::Window* _pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*>& rMemFunc)
{
OSL_ENSURE(_pWindow,"Window can not be null!");
SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : nullptr;
@@ -841,7 +841,7 @@ void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, const
}
}
-SdrObject* isOver(const tools::Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, bool _bAllObjects, SdrObject* _pIgnore, sal_Int16 _nIgnoreType)
+SdrObject* isOver(const tools::Rectangle& _rRect, SdrPage const & _rPage, SdrView const & _rView, bool _bAllObjects, SdrObject const * _pIgnore, sal_Int16 _nIgnoreType)
{
SdrObject* pOverlappedObj = nullptr;
SdrObjListIter aIter(_rPage,SdrIterMode::DeepNoGroups);
@@ -869,7 +869,7 @@ SdrObject* isOver(const tools::Rectangle& _rRect, SdrPage& _rPage, SdrView& _rVi
return pOverlappedObj;
}
-bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength)
+bool checkArrayForOccurrence(SdrObject const * _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength)
{
for(int i=0;i<_nListLength;i++)
{
@@ -882,7 +882,7 @@ bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int
return false;
}
-SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects, SdrUnoObj * _pIgnoreList[], int _nIgnoreListLength)
+SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage const & _rPage,SdrView const & _rView,bool _bAllObjects, SdrUnoObj * _pIgnoreList[], int _nIgnoreListLength)
{
SdrObject* pOverlappedObj = nullptr;
SdrObjListIter aIter(_rPage,SdrIterMode::DeepNoGroups);
@@ -907,10 +907,10 @@ SdrObject* isOver(const tools::Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView
}
-SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView)
+SdrObject* isOver(SdrObject const * _pObj,SdrPage const & _rPage,SdrView const & _rView)
{
SdrObject* pOverlappedObj = nullptr;
- if (dynamic_cast<OUnoObject*>(_pObj) != nullptr || dynamic_cast<OOle2Obj*>(_pObj) != nullptr) // this doesn't need to be done for shapes
+ if (dynamic_cast<OUnoObject const *>(_pObj) != nullptr || dynamic_cast<OOle2Obj const *>(_pObj) != nullptr) // this doesn't need to be done for shapes
{
tools::Rectangle aRect = _pObj->GetCurrentBoundRect();
pOverlappedObj = isOver(aRect,_rPage,_rView,false/*_bUnMarkedObjects*/,_pObj);
@@ -967,7 +967,7 @@ tools::Rectangle getRectangleFromControl(SdrObject* _pControl)
}
// check overlapping
-void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,bool _bInsert)
+void correctOverlapping(SdrObject* _pControl,OReportSection const & _aReportSection,bool _bInsert)
{
OSectionView& rSectionView = _aReportSection.getSectionView();
uno::Reference< report::XReportComponent> xComponent(_pControl->getUnoShape(),uno::UNO_QUERY);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index d9d7b802bfb7..a4e1f719a915 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2236,7 +2236,7 @@ void SAL_CALL OReportController::disposing( const lang::EventObject& Source )
static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups
,sal_Int32 _nGroupPos
- ,::std::mem_fun_t<bool,OGroupHelper>&_pGroupMemberFunction)
+ ,::std::mem_fun_t<bool,OGroupHelper> const & _pGroupMemberFunction)
{
uno::Reference< report::XGroup> xGroup;
sal_uInt16 nNonVisibleGroups = 0;
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index b7e5cb68c72c..625e17543713 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -304,7 +304,7 @@ bool OReportWindow::handleKeyEvent(const KeyEvent& _rEvent)
return m_aViewsWindow->handleKeyEvent(_rEvent);
}
-void OReportWindow::setMarked(OSectionView* _pSectionView, bool _bMark)
+void OReportWindow::setMarked(OSectionView const * _pSectionView, bool _bMark)
{
if ( _pSectionView )
m_aViewsWindow->setMarked(_pSectionView,_bMark);
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index d67c94d55909..c80e49250633 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -284,7 +284,7 @@ bool OScrollWindowHelper::handleKeyEvent(const KeyEvent& _rEvent)
return m_aReportWindow->handleKeyEvent(_rEvent);
}
-void OScrollWindowHelper::setMarked(OSectionView* _pSectionView, bool _bMark)
+void OScrollWindowHelper::setMarked(OSectionView const * _pSectionView, bool _bMark)
{
m_aReportWindow->setMarked(_pSectionView,_bMark);
}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 3c634affa6c2..a7102fef49e3 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -54,7 +54,7 @@ namespace rptui
using namespace ::com::sun::star;
using namespace ::comphelper;
-bool lcl_getNewRectSize(const tools::Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject* _pObj,SdrView* _pView, ControlModification _nControlModification, bool _bBoundRects)
+bool lcl_getNewRectSize(const tools::Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject const * _pObj,SdrView const * _pView, ControlModification _nControlModification, bool _bBoundRects)
{
bool bMoveAllowed = _nXMov != 0 || _nYMov != 0;
if ( bMoveAllowed )
@@ -75,7 +75,7 @@ bool lcl_getNewRectSize(const tools::Rectangle& _aObjRect,long& _nXMov, long& _n
aNewRect.Move(_nXMov,_nYMov);
break;
}
- if (dynamic_cast<OUnoObject*>(_pObj) != nullptr || dynamic_cast<OOle2Obj*>(_pObj) != nullptr)
+ if (dynamic_cast<OUnoObject const *>(_pObj) != nullptr || dynamic_cast<OOle2Obj const *>(_pObj) != nullptr)
{
pOverlappedObj = isOver(aNewRect,*_pObj->GetPage(),*_pView,true,_pObj);
if ( pOverlappedObj && _pObj != pOverlappedObj )
@@ -504,7 +504,7 @@ void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType)
m_bInUnmark = false;
}
-void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
+void OViewsWindow::unmarkAllObjects(OSectionView const * _pSectionView)
{
if ( !m_bInUnmark )
{
@@ -598,7 +598,7 @@ OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _
return aRet;
}
-void OViewsWindow::setMarked(OSectionView* _pSectionView, bool _bMark)
+void OViewsWindow::setMarked(OSectionView const * _pSectionView, bool _bMark)
{
OSL_ENSURE(_pSectionView != nullptr,"SectionView is NULL!");
if ( _pSectionView )
More information about the Libreoffice-commits
mailing list