[Libreoffice-commits] core.git: connectivity/source formula/source include/formula sc/source xmlhelp/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Jul 31 10:10:27 UTC 2017
connectivity/source/drivers/firebird/Catalog.cxx | 2 +-
formula/source/core/api/FormulaCompiler.cxx | 4 ++--
formula/source/ui/dlg/formula.cxx | 8 ++++----
include/formula/FormulaCompiler.hxx | 6 +++---
include/formula/formula.hxx | 4 ++--
include/formula/token.hxx | 2 +-
sc/source/core/tool/token.cxx | 2 +-
xmlhelp/source/cxxhelp/provider/databases.cxx | 6 +++---
xmlhelp/source/cxxhelp/provider/databases.hxx | 6 +++---
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 2 +-
xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx | 2 +-
11 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit b1a1baa66a8eb0553df87769d48e3cc7e533a1d8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jul 31 10:51:42 2017 +0200
loplugin:constparams in formula,xmlhelp
Change-Id: I1c987d991a5b292df327d1bb921099233b5531fe
Reviewed-on: https://gerrit.libreoffice.org/40584
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/firebird/Catalog.cxx b/connectivity/source/drivers/firebird/Catalog.cxx
index 613b6d2e9702..02883c88c5c0 100644
--- a/connectivity/source/drivers/firebird/Catalog.cxx
+++ b/connectivity/source/drivers/firebird/Catalog.cxx
@@ -67,7 +67,7 @@ void Catalog::refreshGroups()
//----- IRefreshableUsers ----------------------------------------------------
void Catalog::refreshUsers()
{
- OUString sSql("SELECT DISTINCT RDB$USER FROM RDB$USER_PRIVILEGES");
+ OUString const sSql("SELECT DISTINCT RDB$USER FROM RDB$USER_PRIVILEGES");
uno::Reference< XResultSet > xUsers = m_xMetaData->getConnection()
->createStatement()->executeQuery(sSql);
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index fce3e1b828c2..8f778bde6b45 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -2590,7 +2590,7 @@ formula::ParamClass FormulaCompiler::GetForceArrayParameter( const FormulaToken*
return ParamClass::Unknown;
}
-void FormulaCompiler::ForceArrayOperator( FormulaTokenRef& rCurr )
+void FormulaCompiler::ForceArrayOperator( FormulaTokenRef const & rCurr )
{
if (!pCurrentFactorToken || (pCurrentFactorToken.get() == rCurr.get()))
return;
@@ -2628,7 +2628,7 @@ void FormulaCompiler::ForceArrayOperator( FormulaTokenRef& rCurr )
}
}
-void FormulaCompiler::CheckSetForceArrayParameter( FormulaTokenRef& rCurr, sal_uInt8 nParam )
+void FormulaCompiler::CheckSetForceArrayParameter( FormulaTokenRef const & rCurr, sal_uInt8 nParam )
{
if (!pCurrentFactorToken)
return;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index ef446966f694..2290a98ac4a4 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -121,7 +121,7 @@ public:
void UpdateParaWin( const Selection& _rSelection, const OUString& _sRefStr);
void SetData( sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int32 nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd);
- void PreNotify( NotifyEvent& rNEvt );
+ void PreNotify( NotifyEvent const & rNEvt );
RefEdit* GetCurrRefEdit();
@@ -381,7 +381,7 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
}
-void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
+void FormulaDlg_Impl::PreNotify( NotifyEvent const & rNEvt )
{
if (m_bIsShutDown)
return;
@@ -1745,7 +1745,7 @@ void FormulaDlg_Impl::SetEdSelection()
}
FormulaModalDialog::FormulaModalDialog( vcl::Window* pParent
- , IFunctionManager* _pFunctionMgr
+ , IFunctionManager const * _pFunctionMgr
, IControlReferenceHandler* _pDlg )
: ModalDialog(pParent, "FormulaDialog", "formula/ui/formuladialog.ui")
, m_pImpl(new FormulaDlg_Impl(this, false/*_bSupportFunctionResult*/,
@@ -1816,7 +1816,7 @@ void FormulaModalDialog::StoreFormEditData(FormEditData* pData)
FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent
- , IFunctionManager* _pFunctionMgr, IControlReferenceHandler* _pDlg ) :
+ , IFunctionManager const * _pFunctionMgr, IControlReferenceHandler* _pDlg ) :
SfxModelessDialog( pB, pCW, pParent, "FormulaDialog", "formula/ui/formuladialog.ui" ),
m_pImpl( new FormulaDlg_Impl(this, true/*_bSupportFunctionResult*/
, true/*_bSupportResult*/
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index ef1c058eaa4e..64e727bbab61 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -368,9 +368,9 @@ private:
set ForceArray at rCurr if so. Set nParam+1 as 1-based
nCurrentFactorParam for subsequent ForceArrayOperator() calls.
*/
- void CheckSetForceArrayParameter( FormulaTokenRef& rCurr, sal_uInt8 nParam );
+ void CheckSetForceArrayParameter( FormulaTokenRef const & rCurr, sal_uInt8 nParam );
- void ForceArrayOperator( FormulaTokenRef& rCurr );
+ void ForceArrayOperator( FormulaTokenRef const & rCurr );
class CurrentFactor
{
@@ -391,7 +391,7 @@ private:
pCompiler->nCurrentFactorParam = nPrevParam;
}
// yes, this operator= may modify the RValue
- void operator=( FormulaTokenRef& r )
+ void operator=( FormulaTokenRef const & r )
{
pCompiler->ForceArrayOperator( r );
pCompiler->pCurrentFactorToken = r;
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index e88cd775ca57..199056ea7b99 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -64,7 +64,7 @@ class FORMULA_DLLPUBLIC FormulaModalDialog : public ModalDialog, public formul
friend class FormulaDlg_Impl;
public:
FormulaModalDialog( vcl::Window* pParent
- ,IFunctionManager* _pFunctionMgr
+ ,IFunctionManager const * _pFunctionMgr
,IControlReferenceHandler* _pDlg );
virtual ~FormulaModalDialog() override;
virtual void dispose() override;
@@ -95,7 +95,7 @@ public:
FormulaDlg( SfxBindings* pB
, SfxChildWindow* pCW
, vcl::Window* pParent
- , IFunctionManager* _pFunctionMgr
+ , IFunctionManager const * _pFunctionMgr
, IControlReferenceHandler* _pDlg );
virtual ~FormulaDlg() override;
virtual void dispose() override;
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 99e99bf374ca..9b06ae48182c 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -423,7 +423,7 @@ private:
pJump;
ParamClass eInForceArray;
public:
- FormulaJumpToken( OpCode e, short* p ) :
+ FormulaJumpToken( OpCode e, short const * p ) :
FormulaToken( formula::svJump , e),
eInForceArray( ParamClass::Unknown)
{
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 07573bc8175e..f1130af4f6b7 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -430,7 +430,7 @@ FormulaToken* ScRawToken::CreateToken() const
return new ScExternalNameToken( extname.nFileId, aName );
}
case svJump :
- return new FormulaJumpToken( eOp, const_cast<short*>(nJump) );
+ return new FormulaJumpToken( eOp, nJump );
case svExternal :
return new FormulaExternalToken( eOp, sbyte.cByte, OUString( cStr+1 ) );
case svFAP :
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 27a61b238da6..5f5300d839b9 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -595,10 +595,10 @@ namespace chelp {
}
-KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases,
+KeywordInfo::KeywordElement::KeywordElement( Databases const *pDatabases,
helpdatafileproxy::Hdf* pHdf,
- OUString& ky,
- OUString& data )
+ OUString const & ky,
+ OUString const & data )
: key( ky )
{
pDatabases->replaceName( key );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 05b82b99729e..b72dfb3dd1ac 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -92,10 +92,10 @@ namespace chelp {
public:
- KeywordElement( Databases* pDatabases,
+ KeywordElement( Databases const * pDatabases,
helpdatafileproxy::Hdf* pHdf,
- OUString& key,
- OUString& ids );
+ OUString const & key,
+ OUString const & ids );
private:
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index f269653af518..dc7982a87e73 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -32,7 +32,7 @@ using namespace com::sun::star::ucb;
ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< XContentProvider >& xProvider,
const uno::Sequence< beans::Property >& seq,
- URLParameter& aURLParameter,
+ URLParameter const & aURLParameter,
Databases* pDatabases )
: ResultSetBase( rxContext, xProvider,seq ),
m_aURLParameter( aURLParameter ),
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
index 3bb96aaef91a..20c41e738b68 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
@@ -39,7 +39,7 @@ namespace chelp {
ResultSetForRoot( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::ucb::XContentProvider >& xProvider,
const css::uno::Sequence< css::beans::Property >& seq,
- URLParameter& aURLParameter,
+ URLParameter const & aURLParameter,
Databases* pDatabases );
More information about the Libreoffice-commits
mailing list