[Libreoffice-commits] core.git: basic/source chart2/source filter/source hwpfilter/source include/filter include/vcl lotuswordpro/source sal/qa sal/rtl sal/textenc sc/inc sc/source sfx2/source sw/inc sw/source vcl/inc vcl/source vcl/unx xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jun 9 13:06:15 UTC 2017
basic/source/comp/codegen.cxx | 20 ++++++------
chart2/source/inc/RegressionCurveCalculator.hxx | 4 +-
chart2/source/inc/TitleHelper.hxx | 2 -
chart2/source/tools/RegressionCurveCalculator.cxx | 4 +-
chart2/source/tools/TitleHelper.cxx | 2 -
chart2/source/view/charttypes/Splines.cxx | 2 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 2 -
chart2/source/view/inc/VSeriesPlotter.hxx | 2 -
filter/source/graphicfilter/icgm/cgm.cxx | 4 +-
filter/source/graphicfilter/icgm/cgm.hxx | 4 +-
filter/source/msfilter/svdfppt.cxx | 2 -
filter/source/t602/t602filter.cxx | 2 -
filter/source/t602/t602filter.hxx | 2 -
hwpfilter/source/cspline.cxx | 4 +-
hwpfilter/source/cspline.h | 4 +-
include/filter/msfilter/svdfppt.hxx | 2 -
include/vcl/alpha.hxx | 2 -
include/vcl/bitmap.hxx | 6 +--
lotuswordpro/source/filter/lwptablelayout.cxx | 2 -
lotuswordpro/source/filter/lwptablelayout.hxx | 2 -
lotuswordpro/source/filter/xfilter/xfbase64.cxx | 2 -
sal/qa/rtl/alloc/rtl_alloc.cxx | 2 -
sal/qa/rtl/digest/rtl_digest.cxx | 2 -
sal/qa/rtl/process/rtl_Process.cxx | 4 +-
sal/rtl/math.cxx | 4 +-
sal/textenc/converter.cxx | 4 +-
sal/textenc/converter.hxx | 4 +-
sc/inc/document.hxx | 4 +-
sc/source/core/data/documen4.cxx | 4 +-
sc/source/filter/xml/xmlfonte.cxx | 4 +-
sc/source/ui/inc/dbfunc.hxx | 2 -
sc/source/ui/view/dbfunc3.cxx | 2 -
sfx2/source/doc/doctempl.cxx | 4 +-
sfx2/source/doc/syspath.cxx | 2 -
sw/inc/undobj.hxx | 4 +-
sw/source/core/doc/doccomp.cxx | 8 ++--
sw/source/core/doc/docedt.cxx | 2 -
sw/source/core/inc/scriptinfo.hxx | 2 -
sw/source/core/text/porlay.cxx | 2 -
sw/source/core/undo/undobj.cxx | 4 +-
sw/source/filter/html/htmlcss1.cxx | 2 -
sw/source/filter/html/swcss1.hxx | 2 -
sw/source/filter/ww8/WW8TableInfo.cxx | 2 -
sw/source/filter/ww8/WW8TableInfo.hxx | 2 -
sw/source/uibase/inc/wrtsh.hxx | 2 -
sw/source/uibase/wrtsh/move.cxx | 2 -
vcl/inc/fontsubset.hxx | 2 -
vcl/inc/sft.hxx | 2 -
vcl/source/filter/igif/gifread.cxx | 4 +-
vcl/source/filter/sgvspln.cxx | 6 +--
vcl/source/filter/sgvtext.cxx | 2 -
vcl/source/fontsubset/fontsubset.cxx | 2 -
vcl/source/fontsubset/sft.cxx | 2 -
vcl/source/gdi/alpha.cxx | 2 -
vcl/source/gdi/bitmap3.cxx | 2 -
vcl/source/gdi/bitmap4.cxx | 2 -
vcl/source/gdi/bmpacc2.cxx | 8 ++--
vcl/source/gdi/pdfwriter_impl.cxx | 10 +++---
vcl/source/gdi/pdfwriter_impl.hxx | 3 +
vcl/source/gdi/salmisc.cxx | 8 ++--
vcl/unx/generic/app/i18n_cb.cxx | 2 -
vcl/unx/generic/gdi/salgdi2.cxx | 2 -
vcl/unx/generic/print/glyphset.cxx | 2 -
xmlsecurity/source/xmlsec/certificateextension_certextn.cxx | 4 +-
xmlsecurity/source/xmlsec/certificateextension_certextn.hxx | 2 -
65 files changed, 110 insertions(+), 109 deletions(-)
New commits:
commit 1dd5e226bd57254024640b10cbbe639f12564655
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 8 12:03:12 2017 +0200
clang-tidy readability-non-const-parameter
Change-Id: I7b2680898dbfc49185fb949349d81f4ac615a470
Reviewed-on: https://gerrit.libreoffice.org/38593
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index fee812fead44..384344e2f9b1 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -389,7 +389,7 @@ class PCodeVisitor
public:
virtual ~PCodeVisitor();
- virtual void start( sal_uInt8* pStart ) = 0;
+ virtual void start( const sal_uInt8* pStart ) = 0;
virtual void processOpCode0( SbiOpcode eOp ) = 0;
virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0;
virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0;
@@ -405,8 +405,8 @@ class PCodeBufferWalker
{
private:
T m_nBytes;
- sal_uInt8* m_pCode;
- static T readParam( sal_uInt8*& pCode )
+ const sal_uInt8* m_pCode;
+ static T readParam( sal_uInt8 const *& pCode )
{
short nBytes = sizeof( T );
T nOp1=0;
@@ -415,15 +415,15 @@ private:
return nOp1;
}
public:
- PCodeBufferWalker( sal_uInt8* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
+ PCodeBufferWalker( const sal_uInt8* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
{
}
void visitBuffer( PCodeVisitor< T >& visitor )
{
- sal_uInt8* pCode = m_pCode;
+ const sal_uInt8* pCode = m_pCode;
if ( !pCode )
return;
- sal_uInt8* pEnd = pCode + m_nBytes;
+ const sal_uInt8* pEnd = pCode + m_nBytes;
visitor.start( m_pCode );
T nOp1 = 0, nOp2 = 0;
for( ; pCode < pEnd; )
@@ -465,7 +465,7 @@ class OffSetAccumulator : public PCodeVisitor< T >
public:
OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){}
- virtual void start( sal_uInt8* /*pStart*/ ) override {}
+ virtual void start( const sal_uInt8* /*pStart*/ ) override {}
virtual void processOpCode0( SbiOpcode /*eOp*/ ) override { ++m_nNumOp0; }
virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ) override { ++m_nNumSingleParams; }
virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) override { ++m_nNumDoubleParams; }
@@ -491,11 +491,11 @@ public:
template < class T, class S >
class BufferTransformer : public PCodeVisitor< T >
{
- sal_uInt8* m_pStart;
+ const sal_uInt8* m_pStart;
SbiBuffer m_ConvertedBuf;
public:
BufferTransformer():m_pStart(nullptr), m_ConvertedBuf( nullptr, 1024 ) {}
- virtual void start( sal_uInt8* pStart ) override { m_pStart = pStart; }
+ virtual void start( const sal_uInt8* pStart ) override { m_pStart = pStart; }
virtual void processOpCode0( SbiOpcode eOp ) override
{
m_ConvertedBuf += (sal_uInt8)eOp;
@@ -544,7 +544,7 @@ public:
{
return m_ConvertedBuf;
}
- static S convertBufferOffSet( sal_uInt8* pStart, T nOp1 )
+ static S convertBufferOffSet( const sal_uInt8* pStart, T nOp1 )
{
PCodeBufferWalker< T > aBuff( pStart, nOp1);
OffSetAccumulator< T, S > aVisitor;
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index aeab66d280fa..c5933e55aa11 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -50,9 +50,9 @@ protected:
const css::uno::Reference< css::util::XNumberFormatter >& xNumFormatter,
sal_Int32 nNumberFormatKey,
double fNumber,
- sal_Int32* pStringLength );
+ const sal_Int32* pStringLength );
- static void addStringToEquation( OUStringBuffer& aStrEquation, sal_Int32& nLineLength, OUStringBuffer& aAddString, sal_Int32* pMaxLength );
+ static void addStringToEquation( OUStringBuffer& aStrEquation, sal_Int32& nLineLength, OUStringBuffer& aAddString, const sal_Int32* pMaxLength );
double m_fCorrelationCoeffitient;
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx
index 3f08684550fe..4a998cb6cb99 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -85,7 +85,7 @@ public:
static void setCompleteString( const OUString& rNewText
, const css::uno::Reference< css::chart2::XTitle >& xTitle
, const css::uno::Reference< css::uno::XComponentContext > & xContext
- , float * pDefaultCharHeight = nullptr );
+ , const float * pDefaultCharHeight = nullptr );
static bool getTitleType( eTitleType& rType
, const css::uno::Reference< css::chart2::XTitle >& xTitle
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index b24df25e27e6..6f2ab6a64288 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -85,7 +85,7 @@ void RegressionCurveCalculator::setRegressionProperties(
OUString RegressionCurveCalculator::getFormattedString(
const Reference< util::XNumberFormatter >& xNumFormatter,
sal_Int32 nNumberFormatKey,
- double fNumber, sal_Int32* pStringLength /* = nullptr */ )
+ double fNumber, const sal_Int32* pStringLength /* = nullptr */ )
{
if ( pStringLength && *pStringLength <= 0 )
return OUString("###");
@@ -194,7 +194,7 @@ OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation(
}
void RegressionCurveCalculator::addStringToEquation(
- OUStringBuffer& aStrEquation, sal_Int32& nLineLength, OUStringBuffer& aAddString, sal_Int32* pMaxWidth)
+ OUStringBuffer& aStrEquation, sal_Int32& nLineLength, OUStringBuffer& aAddString, const sal_Int32* pMaxWidth)
{
if ( pMaxWidth && ( nLineLength + aAddString.getLength() > *pMaxWidth ) )
{ // wrap line
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 5701eb1bc510..e235c5a8e701 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -313,7 +313,7 @@ OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle
void TitleHelper::setCompleteString( const OUString& rNewText
, const uno::Reference< XTitle >& xTitle
, const uno::Reference< uno::XComponentContext > & xContext
- , float * pDefaultCharHeight /* = 0 */ )
+ , const float * pDefaultCharHeight /* = 0 */ )
{
//the format of the first old text portion will be maintained if there is any
if(!xTitle.is())
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index b3cd9a77c67f..6f49d83d9d15 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -473,7 +473,7 @@ bool createParameterT(const tPointVecType& rUniquePoints, double* t)
return bIsSuccessful;
}
-void createKnotVector(const lcl_tSizeType n, const sal_uInt32 p, double* t, double* u)
+void createKnotVector(const lcl_tSizeType n, const sal_uInt32 p, const double* t, double* u)
{ // precondition: 0 = t_0 < t_1 < ... < t_n = 1
for (lcl_tSizeType j = 0; j <= p; ++j)
{
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index be104a475f3b..1d9c90a7bb4b 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -863,7 +863,7 @@ void VSeriesPlotter::createErrorBar(
, const VDataSeries& rVDataSeries
, sal_Int32 nIndex
, bool bYError /* = true */
- , double* pfScaledLogicX
+ , const double* pfScaledLogicX
)
{
if( !ChartTypeHelper::isSupportingStatisticProperties( m_xChartTypeModel, m_nDimension ) )
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 15e955a1fdca..c66f992cf12a 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -356,7 +356,7 @@ protected:
, const VDataSeries& rVDataSeries
, sal_Int32 nIndex
, bool bVertical
- , double* pfScaledLogicX
+ , const double* pfScaledLogicX
);
void createErrorBar_X( const css::drawing::Position3D& rUnscaledLogicPosition
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 3edaae373b82..15ab89778e34 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -171,7 +171,7 @@ sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
}
}
-void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest )
+void CGM::ImplGetSwitch4( const sal_uInt8* pSource, sal_uInt8* pDest )
{
for ( int i = 0; i < 4; i++ )
{
@@ -179,7 +179,7 @@ void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest )
}
}
-void CGM::ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest )
+void CGM::ImplGetSwitch8( const sal_uInt8* pSource, sal_uInt8* pDest )
{
for ( int i = 0; i < 8; i++ )
{
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 462b13928920..f99c8c798ed8 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -93,8 +93,8 @@ class CGM
static sal_uInt8 ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision );
sal_Int32 ImplGetI( sal_uInt32 nPrecision );
sal_uInt32 ImplGetUI( sal_uInt32 nPrecision );
- static void ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest );
- static void ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest );
+ static void ImplGetSwitch4( const sal_uInt8* pSource, sal_uInt8* pDest );
+ static void ImplGetSwitch8( const sal_uInt8* pSource, sal_uInt8* pDest );
double ImplGetFloat( RealPrecision, sal_uInt32 nRealSize );
sal_uInt32 ImplGetBitmapColor( bool bDirectColor = false );
void ImplSetMapMode();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 5f7351712410..14e035a1076a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7543,7 +7543,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
}
}
-SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
+SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, const sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
{
SdrObject* pRet = pGroup;
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index fdd0e88b93ff..d2df9c10b516 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -615,7 +615,7 @@ sal_Int16 T602ImportFilter::readnum(unsigned char *ch, bool show)
return (sal_Int16) atoi(reinterpret_cast<char const *>(buff));
}
-unsigned char T602ImportFilter::Setformat602(char *cmd)
+unsigned char T602ImportFilter::Setformat602(const char *cmd)
{
unsigned char ch;
sal_Int16 i;
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 62d0ffe08dab..e7b0c452b64c 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -216,7 +216,7 @@ private:
void par602(bool endofpage);
void inschr(unsigned char ch);
void inschrdef(unsigned char ch);
- unsigned char Setformat602(char *cmd);
+ unsigned char Setformat602(const char *cmd);
sal_Int16 readnum(unsigned char *ch, bool show);
tnode PointCmd602(unsigned char *ch);
void setfnt(fonts fnt,bool mustwrite);
diff --git a/hwpfilter/source/cspline.cxx b/hwpfilter/source/cspline.cxx
index 80e80820e2a6..32041163e00b 100644
--- a/hwpfilter/source/cspline.cxx
+++ b/hwpfilter/source/cspline.cxx
@@ -53,7 +53,7 @@
#include "cspline.h"
#include "solver.h"
-void NaturalSpline (int N, double* x, double* a, double*& b, double*& c,
+void NaturalSpline (int N, const double* x, const double* a, double*& b, double*& c,
double*& d)
{
const double oneThird = 1.0/3.0;
@@ -111,7 +111,7 @@ void NaturalSpline (int N, double* x, double* a, double*& b, double*& c,
}
}
-void PeriodicSpline (int N, double* x, double* a, double*& b, double*& c,
+void PeriodicSpline (int N, const double* x, const double* a, double*& b, double*& c,
double*& d)
{
std::unique_ptr<double[]> h(new double[N]);
diff --git a/hwpfilter/source/cspline.h b/hwpfilter/source/cspline.h
index c65f555dab11..168018b15c99 100644
--- a/hwpfilter/source/cspline.h
+++ b/hwpfilter/source/cspline.h
@@ -20,9 +20,9 @@
#ifndef INCLUDED_HWPFILTER_SOURCE_CSPLINE_H
#define INCLUDED_HWPFILTER_SOURCE_CSPLINE_H
-void NaturalSpline (int N, double* x, double* a, double*& b, double*& c,
+void NaturalSpline (int N, const double* x, const double* a, double*& b, double*& c,
double*& d);
-void PeriodicSpline (int N, double* x, double* a, double*& b, double*& c,
+void PeriodicSpline (int N, const double* x, const double* a, double*& b, double*& c,
double*& d);
#endif // INCLUDED_HWPFILTER_SOURCE_CSPLINE_H
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index ab13c2f84e39..b319f3fa9e90 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -621,7 +621,7 @@ public:
virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const override;
SdrObject* CreateTable(
SdrObject* pGroupObject,
- sal_uInt32* pTableArry,
+ const sal_uInt32* pTableArry,
SvxMSDffSolverContainer*
);
virtual bool ReadFormControl( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rFormComp ) const = 0;
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 40a1c5a2f561..6e6609d8fd31 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -37,7 +37,7 @@ public:
AlphaMask( const Bitmap& rBitmap );
AlphaMask( const AlphaMask& rAlphaMask );
AlphaMask( AlphaMask&& rAlphaMask );
- AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = nullptr );
+ AlphaMask( const Size& rSizePixel, const sal_uInt8* pEraseTransparency = nullptr );
virtual ~AlphaMask() override;
AlphaMask& operator=( const Bitmap& rBitmap );
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index ead37f45026c..80b58ca509cc 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -666,9 +666,9 @@ public:
Bitmap& aNewBitmap,
BitmapReadAccess* pReadAcc,
int aNumberOfContributions,
- double* pWeights,
+ const double* pWeights,
int* pPixels,
- int* pCount );
+ const int* pCount );
SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold );
SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales );
@@ -703,7 +703,7 @@ public:
SAL_DLLPRIVATE static void ImplBlurContributions(
const int aSize,
const int aNumberOfContributions,
- double* pBlurVector,
+ const double* pBlurVector,
double*& pWeights,
int*& pPixels,
int*& pCount );
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index ad7b987ad7ec..f25104985339 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -881,7 +881,7 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
}
void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable> const & pXFTable,
- sal_uInt8 nFirstColSpann,sal_uInt8* pCellMark)
+ sal_uInt8 nFirstColSpann,const sal_uInt8* pCellMark)
{
sal_uInt16 i;
sal_uInt16 nRowNum = pTmpTable->GetRowCount();
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index 48e00c871b07..11ffd63b2938 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -141,7 +141,7 @@ private:
sal_uInt16 ConvertHeadingRow(rtl::Reference<XFTable> const & pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow);
static bool FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,sal_uInt8& nMaxColSpan);
void SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable> const & pXFTable,
- sal_uInt8 nFirstColSpann,sal_uInt8* pCellMark);
+ sal_uInt8 nFirstColSpann, const sal_uInt8* pCellMark);
std::map<sal_uInt16,LwpRowLayout*> m_RowsMap;
void SplitConflictCells();
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
index 5fdd0a2c4346..257fe638a5ed 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
@@ -71,7 +71,7 @@ const sal_Char aBase64EncodeTable[] =
* @descr Encode 3 byte to 4 byte.
* Please refer to RFC to get the base64 algorithm.
*/
-inline void Encode_(sal_uInt8 *src, sal_Char* dest)
+inline void Encode_(const sal_uInt8 *src, sal_Char* dest)
{
sal_Int32 nBinaer = (src[ 0] << 16) +
(src[1] << 8) +
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index ed0a9def1dbe..30aadcc94f69 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -30,7 +30,7 @@ namespace rtl_alloc
// small memory check routine, which return false, if there is a problem
- bool checkMemory(char* _pMemory, sal_uInt32 _nSize, char _n)
+ bool checkMemory(const char* _pMemory, sal_uInt32 _nSize, char _n)
{
bool bOk = true;
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 93a2cd6e0c63..b61ce9be3fcd 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -71,7 +71,7 @@ const OString constSampleStringSums[] =
};
// Create hex-value string from the digest value to keep the string size minimal
-OString createHex(sal_uInt8* pKeyBuffer, sal_uInt32 nKeyLen)
+OString createHex(const sal_uInt8* pKeyBuffer, sal_uInt32 nKeyLen)
{
OStringBuffer aBuffer(nKeyLen * 2 + 1);
for (sal_uInt32 i = 0; i < nKeyLen; ++i)
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index e4b0465a2455..f671c3d2d133 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -144,7 +144,7 @@ public:
/************************************************************************
* For diagnostics( from sal/test/testuuid.cxx )
************************************************************************/
-void printUuid( sal_uInt8 *pNode )
+void printUuid( const sal_uInt8 *pNode )
{
printf("# UUID is: ");
for( sal_Int32 i1 = 0 ; i1 < 4 ; i1++ )
@@ -168,7 +168,7 @@ void printUuid( sal_uInt8 *pNode )
/**************************************************************************
* output UUID to a string
**************************************************************************/
-void printUuidtoBuffer( sal_uInt8 *pNode, sal_Char * pBuffer )
+void printUuidtoBuffer( const sal_uInt8 *pNode, sal_Char * pBuffer )
{
sal_Int8 nPtr = 0;
for( sal_Int32 i1 = 0 ; i1 < 16 ; i1++ )
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 7eeeb85b4013..2db259b86917 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -86,7 +86,7 @@ struct StringTraits
}
static void createBuffer(rtl_String ** pBuffer,
- sal_Int32 * pCapacity)
+ const sal_Int32 * pCapacity)
{
rtl_string_new_WithLength(pBuffer, *pCapacity);
}
@@ -123,7 +123,7 @@ struct UStringTraits
}
static void createBuffer(rtl_uString ** pBuffer,
- sal_Int32 * pCapacity)
+ const sal_Int32 * pCapacity)
{
rtl_uString_new_WithLength(pBuffer, *pCapacity);
}
diff --git a/sal/textenc/converter.cxx b/sal/textenc/converter.cxx
index 109469fffdb5..5aa07163843e 100644
--- a/sal/textenc/converter.cxx
+++ b/sal/textenc/converter.cxx
@@ -29,7 +29,7 @@
sal::detail::textenc::BadInputConversionAction
sal::detail::textenc::handleBadInputTextToUnicodeConversion(
bool bUndefined, bool bMultiByte, char cByte, sal_uInt32 nFlags,
- sal_Unicode ** pDestBufPtr, sal_Unicode * pDestBufEnd, sal_uInt32 * pInfo)
+ sal_Unicode ** pDestBufPtr, const sal_Unicode * pDestBufEnd, sal_uInt32 * pInfo)
{
*pInfo |= bUndefined
? (bMultiByte
@@ -80,7 +80,7 @@ sal::detail::textenc::handleBadInputTextToUnicodeConversion(
sal::detail::textenc::BadInputConversionAction
sal::detail::textenc::handleBadInputUnicodeToTextConversion(
bool bUndefined, sal_uInt32 nUtf32, sal_uInt32 nFlags, char ** pDestBufPtr,
- char * pDestBufEnd, sal_uInt32 * pInfo, char const * pPrefix,
+ const char * pDestBufEnd, sal_uInt32 * pInfo, char const * pPrefix,
sal_Size nPrefixLen, bool * pPrefixWritten)
{
// TODO! RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE
diff --git a/sal/textenc/converter.hxx b/sal/textenc/converter.hxx
index bbbd91784fdf..786b8fe89b0b 100644
--- a/sal/textenc/converter.hxx
+++ b/sal/textenc/converter.hxx
@@ -38,12 +38,12 @@ enum BadInputConversionAction
BadInputConversionAction SAL_DLLPUBLIC
handleBadInputTextToUnicodeConversion(
bool bUndefined, bool bMultiByte, char cByte, sal_uInt32 nFlags,
- sal_Unicode ** pDestBufPtr, sal_Unicode * pDestBufEnd, sal_uInt32 * pInfo);
+ sal_Unicode ** pDestBufPtr, const sal_Unicode * pDestBufEnd, sal_uInt32 * pInfo);
BadInputConversionAction SAL_DLLPUBLIC
handleBadInputUnicodeToTextConversion(
bool bUndefined, sal_uInt32 nUtf32, sal_uInt32 nFlags, char ** pDestBufPtr,
- char * pDestBufEnd, sal_uInt32 * pInfo, char const * pPrefix,
+ const char * pDestBufEnd, sal_uInt32 * pInfo, char const * pPrefix,
sal_Size nPrefixLen, bool * pPrefixWritten);
} } }
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c55da1b5a4ed..806a2338f289 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2025,11 +2025,11 @@ private:
sal_uInt16 RowDifferences( SCROW nThisRow, SCTAB nThisTab,
ScDocument& rOtherDoc,
SCROW nOtherRow, SCTAB nOtherTab,
- SCCOL nMaxCol, SCCOLROW* pOtherCols );
+ SCCOL nMaxCol, const SCCOLROW* pOtherCols );
sal_uInt16 ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
ScDocument& rOtherDoc,
SCCOL nOtherCol, SCTAB nOtherTab,
- SCROW nMaxRow, SCCOLROW* pOtherRows );
+ SCROW nMaxRow, const SCCOLROW* pOtherRows );
void FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow,
bool bColumns,
ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab,
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index c157a5f59ac3..a6cbd1a321f6 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -928,7 +928,7 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew)
sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab,
ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab,
- SCCOL nMaxCol, SCCOLROW* pOtherCols )
+ SCCOL nMaxCol, const SCCOLROW* pOtherCols )
{
sal_uLong nDif = 0;
sal_uLong nUsed = 0;
@@ -966,7 +966,7 @@ sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab,
sal_uInt16 ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab,
- SCROW nMaxRow, SCCOLROW* pOtherRows )
+ SCROW nMaxRow, const SCCOLROW* pOtherRows )
{
//TODO: optimize e.g. with iterator?
diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx
index 7975e0e7f196..bdf4b5537d8d 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -36,14 +36,14 @@ private:
// #i120077# remember owned pool
SfxItemPool* mpEditEnginePool;
- void AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const bool bExportDefaults);
+ void AddFontItems(const sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const bool bExportDefaults);
public:
ScXMLFontAutoStylePool_Impl( ScXMLExport& rExport, bool bBlockFontEmbedding );
virtual ~ScXMLFontAutoStylePool_Impl() override;
};
-void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const bool bExportDefaults)
+void ScXMLFontAutoStylePool_Impl::AddFontItems(const sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const bool bExportDefaults)
{
for( sal_uInt16 i=0; i < nIdCount; ++i )
{
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index a0f1fd5ec077..aab2990adea1 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -85,7 +85,7 @@ public:
void UngroupDataPilot();
void DataPilotInput( const ScAddress& rPos, const OUString& rString );
- void DataPilotSort(ScDPObject* pDPObject, long nDimIndex, bool bAscending, sal_uInt16* pUserListId = nullptr);
+ void DataPilotSort(ScDPObject* pDPObject, long nDimIndex, bool bAscending, const sal_uInt16* pUserListId = nullptr);
bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
bool HasSelectionForDrillDown( css::sheet::DataPilotFieldOrientation& rOrientation );
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index cc512457c5d3..bf745e24294f 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1608,7 +1608,7 @@ struct ScOUStringCollate
}
};
-void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending, sal_uInt16* pUserListId)
+void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending, const sal_uInt16* pUserListId)
{
if (!pDPObj)
return;
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index ca3ebf2428be..a3733619f5f7 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -178,7 +178,7 @@ public:
void AddEntry( const OUString& rTitle,
const OUString& rTargetURL,
- size_t *pPos );
+ const size_t *pPos );
void DeleteEntry( size_t nIndex );
int Compare( RegionData_Impl* pCompareWith ) const;
@@ -1341,7 +1341,7 @@ size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, bool& rFound ) cons
void RegionData_Impl::AddEntry( const OUString& rTitle,
const OUString& rTargetURL,
- size_t *pPos )
+ const size_t *pPos )
{
INetURLObject aLinkObj( GetHierarchyURL() );
aLinkObj.insertName( rTitle, false,
diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx
index 32094d331f39..44525e5fcbf4 100644
--- a/sfx2/source/doc/syspath.cxx
+++ b/sfx2/source/doc/syspath.cxx
@@ -20,7 +20,7 @@
#include "syspath.hxx"
#include <syspathw32.hxx>
-bool SystemPath::GetUserTemplateLocation(sal_Unicode* pFolder, int nSize )
+bool SystemPath::GetUserTemplateLocation( sal_Unicode* pFolder, int nSize )
{
#ifdef _WIN32
return ::GetUserTemplateLocation( pFolder, nSize );
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 7c8ea72590a8..61f7735cf4cf 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -59,7 +59,7 @@ protected:
bool bCacheComment;
mutable std::unique_ptr<OUString> pComment;
- static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = nullptr );
+ static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, const sal_uLong* pEndIdx = nullptr );
static void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext );
static void RemoveIdxRel( sal_uLong, const SwPosition& );
@@ -163,7 +163,7 @@ protected:
sal_uLong* pEndNdIdx = nullptr, sal_Int32 * pEndCntIdx = nullptr );
static void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
SwPosition& rInsPos,
- sal_uLong* pEndNdIdx = nullptr, sal_Int32 * pEndCntIdx = nullptr );
+ const sal_uLong* pEndNdIdx = nullptr, const sal_Int32 * pEndCntIdx = nullptr );
// These two methods move the SPoint back/forth from PaM. With it
// a range can be spanned for Undo/Redo. (In this case the SPoint
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index de6c6324d067..0a7bbc55edee 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -213,7 +213,7 @@ public:
sal_uLong nCount;
public:
- MovedData( CompareData& rData, sal_Char* pDiscard );
+ MovedData( CompareData& rData, const sal_Char* pDiscard );
~MovedData();
sal_uLong GetIndex( sal_uLong n ) const { return pIndex[ n ]; }
@@ -240,7 +240,7 @@ private:
static void CountDifference( const CompareData& rData, sal_uLong* pCounts );
static void SetDiscard( const CompareData& rData,
- sal_Char* pDiscard, sal_uLong* pCounts );
+ sal_Char* pDiscard, const sal_uLong* pCounts );
static void CheckDiscard( sal_uLong nLen, sal_Char* pDiscard );
static void ShiftBoundaries( CompareData& rData1, CompareData& rData2 );
@@ -636,7 +636,7 @@ void Compare::CountDifference( const CompareData& rData, sal_uLong* pCounts )
}
void Compare::SetDiscard( const CompareData& rData,
- sal_Char* pDiscard, sal_uLong* pCounts )
+ sal_Char* pDiscard, const sal_uLong* pCounts )
{
const sal_uLong nLen = rData.GetLineCount();
@@ -771,7 +771,7 @@ void Compare::CheckDiscard( sal_uLong nLen, sal_Char* pDiscard )
}
}
-Compare::MovedData::MovedData( CompareData& rData, sal_Char* pDiscard )
+Compare::MovedData::MovedData( CompareData& rData, const sal_Char* pDiscard )
: pIndex( nullptr ), pLineNum( nullptr ), nCount( 0 )
{
sal_uLong nLen = rData.GetLineCount();
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 4782b010d8ed..4c80964c6ba8 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -286,7 +286,7 @@ void SaveRedlEndPosForRestore::Restore_()
}
/// Convert list of ranges of whichIds to a corresponding list of whichIds
-static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
+static std::vector<sal_uInt16> * lcl_RangesToVector(const sal_uInt16 * pRanges)
{
std::vector<sal_uInt16> * pResult = new std::vector<sal_uInt16>;
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 74a792462dce..02e4c5abf7ff 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -288,7 +288,7 @@ public:
/** Marks nCnt kashida positions as invalid
pKashidaPositions: array of char indices relative to the paragraph
*/
- bool MarkKashidasInvalid(sal_Int32 nCnt, sal_Int32* pKashidaPositions);
+ bool MarkKashidasInvalid(sal_Int32 nCnt, const sal_Int32* pKashidaPositions);
/** Marks nCnt kashida positions as invalid
in the given text range
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 97c11ba5ecb7..4492bf729e69 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1930,7 +1930,7 @@ void SwScriptInfo::ClearNoKashidaLine(sal_Int32 nStt, sal_Int32 nLen)
}
// mark the given character indices as invalid kashida positions
-bool SwScriptInfo::MarkKashidasInvalid(sal_Int32 nCnt, sal_Int32* pKashidaPositions)
+bool SwScriptInfo::MarkKashidasInvalid(sal_Int32 nCnt, const sal_Int32* pKashidaPositions)
{
SAL_WARN_IF( !pKashidaPositions || nCnt == 0, "sw.core", "Where are kashidas?" );
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 4b178c130776..13f0843b95e7 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -113,7 +113,7 @@ SwPaM & SwUndRng::AddUndoRedoPaM(
}
void SwUndo::RemoveIdxFromSection( SwDoc& rDoc, sal_uLong nSttIdx,
- sal_uLong* pEndIdx )
+ const sal_uLong* pEndIdx )
{
SwNodeIndex aIdx( rDoc.GetNodes(), nSttIdx );
SwNodeIndex aEndIdx( rDoc.GetNodes(), pEndIdx ? *pEndIdx
@@ -361,7 +361,7 @@ void SwUndoSaveContent::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
void SwUndoSaveContent::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
SwPosition& rInsPos,
- sal_uLong* pEndNdIdx, sal_Int32* pEndCntIdx )
+ const sal_uLong* pEndNdIdx, const sal_Int32* pEndCntIdx )
{
// here comes the recovery
SwNodes & rNds = rDoc.GetUndoManager().GetUndoNodes();
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index f059050717ac..eb72f91f3bd7 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -96,7 +96,7 @@ void SwCSS1Parser::ChgPageDesc( const SwPageDesc *pPageDesc,
pDoc->ChgPageDesc( pos, rNewPageDesc );
}
-SwCSS1Parser::SwCSS1Parser( SwDoc *pD, sal_uInt32 aFHeights[7], const OUString& rBaseURL, bool bNewDoc ) :
+SwCSS1Parser::SwCSS1Parser( SwDoc *pD, const sal_uInt32 aFHeights[7], const OUString& rBaseURL, bool bNewDoc ) :
SvxCSS1Parser( pD->GetAttrPool(), rBaseURL,
reinterpret_cast<sal_uInt16*>(&aItemIds), sizeof(aItemIds) / sizeof(sal_uInt16) ),
pDoc( pD ),
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index e3150d623451..e671c8cfc5c7 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -72,7 +72,7 @@ protected:
using CSS1Parser::ParseStyleSheet;
public:
- SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, bool bNewDoc );
+ SwCSS1Parser( SwDoc *pDoc, sal_uInt32 const aFHeight[7], const OUString& rBaseURL, bool bNewDoc );
virtual ~SwCSS1Parser() override;
virtual bool ParseStyleSheet( const OUString& rIn ) override;
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index cc1be4c35f68..123c2d6b2eba 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -1089,7 +1089,7 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(long nTop)
void WW8TableCellGrid::insert(const SwRect & rRect,
WW8TableNodeInfo * pNodeInfo,
- unsigned long * pFormatFrameWidth)
+ const unsigned long * pFormatFrameWidth)
{
CellInfo aCellInfo(rRect, pNodeInfo);
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index a74f69c86e85..6d2b814f1882 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -274,7 +274,7 @@ public:
~WW8TableCellGrid();
void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
- unsigned long * pFormatFrameWidth = nullptr);
+ unsigned long const * pFormatFrameWidth = nullptr);
void addShadowCells();
WW8TableNodeInfo *connectCells(RowEndInners_t &rLastRowEnds);
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 70791c63e82e..c491a10ec387 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -591,7 +591,7 @@ private:
SAL_DLLPRIVATE bool GoStart(bool KeepArea, bool *,
bool bSelect = false, bool bDontMoveRegion = false);
- SAL_DLLPRIVATE bool GoEnd(bool KeepArea = false, bool * = nullptr);
+ SAL_DLLPRIVATE bool GoEnd(bool KeepArea = false, const bool * = nullptr);
enum BookMarkMove
{
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 5612f5f856b9..94769047d0d3 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -260,7 +260,7 @@ bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable,
SwCursorShell::SttEndDoc(true);
}
-bool SwWrtShell::GoEnd(bool bKeepArea, bool *pMoveTable)
+bool SwWrtShell::GoEnd(bool bKeepArea, const bool *pMoveTable)
{
if ( pMoveTable && *pMoveTable )
return MoveTable( GotoCurrTable, fnTableEnd );
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 3ec9826b8f80..6705361d6ddb 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -85,7 +85,7 @@ private:
bool CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths );
bool CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths );
- static bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths );
+ static bool CreateFontSubsetFromType1( const sal_Int32* pOutGlyphWidths );
};
#endif // INCLUDED_VCL_INC_FONTSUBSET_HXX
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 17efc970fa9b..1ab62e56040d 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -418,7 +418,7 @@ namespace vcl
* @ingroup sft
*
*/
- TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, sal_uInt16 *glyphArray, int nGlyphs, bool vertical);
+ TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, const sal_uInt16 *glyphArray, int nGlyphs, bool vertical);
#if defined(_WIN32) || defined(MACOSX) || defined(IOS)
/**
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index b9611ca66992..3b2a74302d32 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -96,7 +96,7 @@ class GIFReader : public GraphicReader
bool ReadExtension();
bool ReadLocalHeader();
sal_uLong ReadNextBlock();
- void FillImages( sal_uInt8* pBytes, sal_uLong nCount );
+ void FillImages( const sal_uInt8* pBytes, sal_uLong nCount );
void CreateNewBitmaps();
bool ProcessGIF();
@@ -517,7 +517,7 @@ sal_uLong GIFReader::ReadNextBlock()
return nRet;
}
-void GIFReader::FillImages( sal_uInt8* pBytes, sal_uLong nCount )
+void GIFReader::FillImages( const sal_uInt8* pBytes, sal_uLong nCount )
{
for( sal_uLong i = 0UL; i < nCount; i++ )
{
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 0e8740a2f4f7..021d70399c6e 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -125,7 +125,7 @@ short basis() /* calculate BASE machine independence */
/*---------------------- MODULE tridiagonal -----------------------*/
sal_uInt16 TriDiagGS(sal_uInt16 n, double* lower,
- double* diag, double* upper, double* b)
+ double* diag, const double* upper, double* b)
/*************************/
/* Gaussian methods for */
/* tridiagonal matrices */
@@ -389,7 +389,7 @@ sal_uInt16 ZyklTriDiagGS(sal_uInt16 n, double* lower, double* diag,
} // extern "C"
// Calculates the coefficients of natural cubic splines with n intervals.
-sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y,
+sal_uInt16 NaturalSpline(sal_uInt16 n, const double* x, const double* y,
double Marg0, double MargN,
sal_uInt8 MargCond,
double* b, double* c, double* d)
@@ -490,7 +490,7 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y,
}
// calculates the coefficients of periodical cubic splines with n intervals.
-sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y,
+sal_uInt16 PeriodicSpline(sal_uInt16 n, const double* x, double* y,
double* b, double* c, double* d)
{ // array dimensions should range from [0..n]!
sal_uInt16 Error;
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index d5ce9c988b3b..dfc2e0a7a8a9 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -261,7 +261,7 @@ UCHAR GetNextChar(UCHAR* TBuf, sal_uInt16 Index)
return TBuf[Index];
}
-UCHAR ProcessOne(UCHAR* TBuf, sal_uInt16& Index,
+UCHAR ProcessOne(const UCHAR* TBuf, sal_uInt16& Index,
ObjTextType& Atr0, ObjTextType& AktAtr,
bool ScanEsc)
{
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index be3de69e01e7..51369ffce76f 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -156,7 +156,7 @@ bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths )
}
// TODO: replace dummy implementation
-bool FontSubsetInfo::CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths)
+bool FontSubsetInfo::CreateFontSubsetFromType1( const sal_Int32* pOutGlyphWidths)
{
(void)pOutGlyphWidths;
fprintf(stderr,"CreateFontSubsetFromType1: replace dummy implementation\n");
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index c1570b56855e..db0caf4f6649 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2344,7 +2344,7 @@ bool GetSfntTable( TrueTypeFont* ttf, int nSubtableIndex,
return bOk;
}
-TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, sal_uInt16 *glyphArray, int nGlyphs, bool vertical)
+TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, const sal_uInt16 *glyphArray, int nGlyphs, bool vertical)
{
const sal_uInt8* pTable;
sal_uInt32 n;
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 5ee1adbff428..6d628405373b 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -42,7 +42,7 @@ AlphaMask::AlphaMask( AlphaMask&& rAlphaMask ) :
{
}
-AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) :
+AlphaMask::AlphaMask( const Size& rSizePixel, const sal_uInt8* pEraseTransparency ) :
Bitmap( rSizePixel, 8, &Bitmap::GetGreyPalette( 256 ) )
{
if( pEraseTransparency )
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 38c3dbcc68dc..31796149ad9e 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2123,7 +2123,7 @@ bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent,
return bRet;
}
-bool Bitmap::ImplConvolutionPass(Bitmap& aNewBitmap, BitmapReadAccess* pReadAcc, int aNumberOfContributions, double* pWeights, int* pPixels, int* pCount)
+bool Bitmap::ImplConvolutionPass(Bitmap& aNewBitmap, BitmapReadAccess* pReadAcc, int aNumberOfContributions, const double* pWeights, int* pPixels, const int* pCount)
{
if (!pReadAcc)
return false;
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 789ebc80296e..d5e995770993 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -1064,7 +1064,7 @@ double* MakeBlurKernel(const double radius, int& rows) {
}
void Bitmap::ImplBlurContributions( const int aSize, const int aNumberOfContributions,
- double* pBlurVector, double*& pWeights, int*& pPixels, int*& pCount )
+ const double* pBlurVector, double*& pWeights, int*& pPixels, int*& pCount )
{
pWeights = new double[ aSize*aNumberOfContributions ];
pPixels = new int[ aSize*aNumberOfContributions ];
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx
index ab67ddda9d3e..984cdb138e87 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/gdi/bmpacc2.cxx
@@ -25,7 +25,7 @@ BitmapColor BitmapReadAccess::GetPixelForN1BitMsbPal(ConstScanline pScanline, lo
return BitmapColor( pScanline[ nX >> 3 ] & ( 1 << ( 7 - ( nX & 7 ) ) ) ? 1 : 0 );
}
-void BitmapReadAccess::SetPixelForN1BitMsbPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
+void BitmapReadAccess::SetPixelForN1BitMsbPal(const Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
{
sal_uInt8& rByte = pScanline[ nX >> 3 ];
@@ -38,7 +38,7 @@ BitmapColor BitmapReadAccess::GetPixelForN1BitLsbPal(ConstScanline pScanline, lo
return BitmapColor( pScanline[ nX >> 3 ] & ( 1 << ( nX & 7 ) ) ? 1 : 0 );
}
-void BitmapReadAccess::SetPixelForN1BitLsbPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
+void BitmapReadAccess::SetPixelForN1BitLsbPal(const Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
{
sal_uInt8& rByte = pScanline[ nX >> 3 ];
@@ -51,7 +51,7 @@ BitmapColor BitmapReadAccess::GetPixelForN4BitMsnPal(ConstScanline pScanline, lo
return BitmapColor( ( pScanline[ nX >> 1 ] >> ( nX & 1 ? 0 : 4 ) ) & 0x0f );
}
-void BitmapReadAccess::SetPixelForN4BitMsnPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
+void BitmapReadAccess::SetPixelForN4BitMsnPal(const Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
{
sal_uInt8& rByte = pScanline[ nX >> 1 ];
@@ -64,7 +64,7 @@ BitmapColor BitmapReadAccess::GetPixelForN4BitLsnPal(ConstScanline pScanline, lo
return BitmapColor( ( pScanline[ nX >> 1 ] >> ( nX & 1 ? 4 : 0 ) ) & 0x0f );
}
-void BitmapReadAccess::SetPixelForN4BitLsnPal(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
+void BitmapReadAccess::SetPixelForN4BitLsnPal(const Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&)
{
sal_uInt8& rByte = pScanline[ nX >> 1 ];
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 87d536b8f848..e9042a10ec82 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -956,7 +956,7 @@ class Matrix3
{
double f[6];
- void set( double *pn ) { for( int i = 0 ; i < 6; i++ ) f[i] = pn[i]; }
+ void set( const double *pn ) { for( int i = 0 ; i < 6; i++ ) f[i] = pn[i]; }
public:
Matrix3();
@@ -3053,9 +3053,9 @@ static void appendSubsetName( int nSubsetID, const OUString& rPSName, OStringBuf
}
sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding,
- sal_Ucs* pCodeUnits,
- sal_Int32* pCodeUnitsPerGlyph,
- sal_Int32* pEncToUnicodeIndex,
+ const sal_Ucs* pCodeUnits,
+ const sal_Int32* pCodeUnitsPerGlyph,
+ const sal_Int32* pEncToUnicodeIndex,
int nGlyphs )
{
int nMapped = 0;
@@ -6120,7 +6120,7 @@ my_NSS_CMSSignerInfo_AddAuthAttr(NSSCMSSignerInfo *signerinfo, NSSCMSAttribute *
return my_NSS_CMSAttributeArray_AddAttr(signerinfo->cmsg->poolp, &(signerinfo->authAttr), attr);
}
-NSSCMSMessage *CreateCMSMessage(PRTime* time,
+NSSCMSMessage *CreateCMSMessage(const PRTime* time,
NSSCMSSignedData **cms_sd,
NSSCMSSignerInfo **cms_signer,
CERTCertificate *cert,
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 0132897f71ee..e356024106c9 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -880,7 +880,8 @@ i12626
/* writes a font descriptor and returns its object id (or 0) */
sal_Int32 emitFontDescriptor( const PhysicalFontFace*, FontSubsetInfo&, sal_Int32 nSubsetID, sal_Int32 nStream );
/* writes a ToUnicode cmap, returns the corresponding stream object */
- sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pCodeUnits, sal_Int32* pCodeUnitsPerGlyph, sal_Int32* pEncToUnicodeIndex, int nGlyphs );
+ sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, const sal_Ucs* pCodeUnits, const sal_Int32* pCodeUnitsPerGlyph,
+ const sal_Int32* pEncToUnicodeIndex, int nGlyphs );
/* get resource dict object number */
sal_Int32 getResourceDictObj()
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 4f239efb95c6..0befbf6f3a93 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -65,7 +65,7 @@ static long ImplIndexFromColor( const BitmapColor& rCol )
static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
- Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
+ Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY )
{
const long nHeight1 = rDstBuffer.mnHeight - 1;
const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
@@ -98,7 +98,7 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuff
static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
- Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
+ Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY )
{
const long nHeight1 = rDstBuffer.mnHeight - 1;
const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
@@ -177,7 +177,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe
static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
- Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
+ Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY )
{
const long nHeight1 = rDstBuffer.mnHeight - 1;
const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
@@ -221,7 +221,7 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer
static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
- Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
+ Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY )
{
const long nHeight1 = rDstBuffer.mnHeight- 1;
const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 0d6570d4dc74..f291e2b6bf1b 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -247,7 +247,7 @@ Preedit_UpdateAttributes ( preedit_text_t* ptext, XIMFeedback* feedback,
// EXTTEXTINPUT_ATTR values
// returns an allocate list of attributes, which must be freed by caller
ExtTextInputAttr*
-Preedit_FeedbackToSAL ( XIMFeedback* pfeedback, int nlength, std::vector<ExtTextInputAttr>& rSalAttr )
+Preedit_FeedbackToSAL ( const XIMFeedback* pfeedback, int nlength, std::vector<ExtTextInputAttr>& rSalAttr )
{
ExtTextInputAttr *psalattr;
ExtTextInputAttr nval;
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 9b2b3c9db3a4..4e9219505069 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -107,7 +107,7 @@ bool X11SalGraphics::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap*
extern "C"
{
- static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, XPointer pFrameWindow )
+ static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, const XPointer pFrameWindow )
{
Bool bRet = False;
if( (pEvent->type == GraphicsExpose || pEvent->type == NoExpose) &&
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
index 531af284aa8e..580766b44b0a 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -212,7 +212,7 @@ struct EncEntry
static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
const char* pGlyphSetName, int nGlyphCount,
- /*const*/ sal_uInt16* pRequestedGlyphs, /*const*/ unsigned char* pEncoding,
+ /*const*/ const sal_uInt16* pRequestedGlyphs, /*const*/ const unsigned char* pEncoding,
bool bAllowType42, bool /*bAllowCID*/ )
{
// match the font-subset to the printer capabilities
diff --git a/xmlsecurity/source/xmlsec/certificateextension_certextn.cxx b/xmlsecurity/source/xmlsec/certificateextension_certextn.cxx
index 3c333d2ed64d..b7b5f1e9df1c 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_certextn.cxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_certextn.cxx
@@ -24,8 +24,8 @@ CertificateExtension_CertExtn::CertificateExtension_CertExtn()
{
}
-void CertificateExtension_CertExtn::setCertExtn(unsigned char* value, unsigned int vlen,
- unsigned char* id, unsigned int idlen, bool critical)
+void CertificateExtension_CertExtn::setCertExtn(const unsigned char* value, unsigned int vlen,
+ const unsigned char* id, unsigned int idlen, bool critical)
{
unsigned int i ;
if( value != nullptr && vlen != 0 ) {
diff --git a/xmlsecurity/source/xmlsec/certificateextension_certextn.hxx b/xmlsecurity/source/xmlsec/certificateextension_certextn.hxx
index 9f4d3842aa33..bb1ca1439a5a 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_certextn.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_certextn.hxx
@@ -30,7 +30,7 @@ struct CertificateExtension_CertExtn
css::uno::Sequence< sal_Int8 > m_xExtnValue;
CertificateExtension_CertExtn();
- void setCertExtn(unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical);
+ void setCertExtn(unsigned char const * value, unsigned int vlen, unsigned char const * id, unsigned int idlen, bool critical);
};
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_CERTIFICATEEXTENSION_CERTEXTN_HXX
More information about the Libreoffice-commits
mailing list