[Libreoffice-commits] core.git: basic/source compilerplugins/clang connectivity/source cui/source dbaccess/source include/basic include/connectivity include/svx include/tools include/ucbhelper include/vcl lotuswordpro/source oox/inc oox/source reportdesign/inc reportdesign/source sc/inc sc/source sdext/source slideshow/source svgio/inc svgio/source svtools/source svx/source sw/inc sw/source tools/source ucbhelper/source ucb/source vcl/headless vcl/inc vcl/source writerfilter/inc writerfilter/source
Noel Grandin
noel at peralex.com
Fri May 6 06:49:02 UTC 2016
basic/source/classes/codecompletecache.cxx | 12 -
basic/source/comp/parser.cxx | 2
basic/source/inc/parser.hxx | 2
basic/source/sbx/sbxvalue.cxx | 2
compilerplugins/clang/passstuffbyref.cxx | 103 +++++++---
connectivity/source/commontools/FValue.cxx | 20 -
connectivity/source/commontools/sqlerror.cxx | 8
cui/source/dialogs/colorpicker.cxx | 16 -
dbaccess/source/ui/dlg/dlgsave.cxx | 6
dbaccess/source/ui/inc/FieldDescriptions.hxx | 8
dbaccess/source/ui/inc/IUpdateHelper.hxx | 2
dbaccess/source/ui/inc/UITools.hxx | 2
dbaccess/source/ui/inc/dlgsave.hxx | 2
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/misc/UpdateHelperImpl.hxx | 4
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 8
include/basic/codecompletecache.hxx | 12 -
include/basic/sbxvar.hxx | 2
include/connectivity/FValue.hxx | 22 +-
include/svx/framelink.hxx | 8
include/tools/datetime.hxx | 2
include/ucbhelper/simplecertificatevalidationrequest.hxx | 2
include/vcl/lstbox.hxx | 2
include/vcl/quickselectionengine.hxx | 2
lotuswordpro/source/filter/lwpmargins.hxx | 4
lotuswordpro/source/filter/lwpstory.cxx | 2
lotuswordpro/source/filter/lwpstory.hxx | 6
lotuswordpro/source/filter/lwptools.hxx | 8
oox/inc/drawingml/texteffectscontext.hxx | 2
oox/source/drawingml/texteffectscontext.cxx | 2
reportdesign/inc/ReportDefinition.hxx | 2
reportdesign/source/core/api/Group.cxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/core/api/Tools.cxx | 2
reportdesign/source/core/inc/Group.hxx | 2
reportdesign/source/core/inc/Tools.hxx | 2
sc/inc/reordermap.hxx | 2
sc/inc/table.hxx | 2
sc/source/core/data/table6.cxx | 2
sc/source/core/tool/reordermap.cxx | 2
sc/source/filter/ftools/fapihelper.cxx | 2
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/ui/vba/vbainterior.cxx | 2
sc/source/ui/vba/vbainterior.hxx | 2
sdext/source/minimizer/informationdialog.cxx | 2
sdext/source/minimizer/informationdialog.hxx | 2
slideshow/source/engine/eventmultiplexer.cxx | 6
slideshow/source/engine/slide/userpaintoverlay.cxx | 4
slideshow/source/inc/eventmultiplexer.hxx | 4
svgio/inc/svgio/svgreader/svgtools.hxx | 10
svgio/source/svgreader/svgtools.cxx | 32 +--
svtools/source/contnr/fileview.cxx | 4
svx/source/dialog/framelink.cxx | 4
sw/inc/IDocumentDrawModelAccess.hxx | 4
sw/source/core/doc/DocumentDrawModelManager.cxx | 4
sw/source/core/inc/DocumentDrawModelManager.hxx | 4
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 2
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 2
tools/source/datetime/datetime.cxx | 2
ucb/source/ucp/file/shell.cxx | 6
ucb/source/ucp/file/shell.hxx | 6
ucbhelper/source/provider/simplecertificatevalidationrequest.cxx | 2
vcl/headless/svpgdi.cxx | 10
vcl/inc/headless/svpgdi.hxx | 2
vcl/inc/listbox.hxx | 2
vcl/source/control/imp_listbox.cxx | 2
vcl/source/control/listbox.cxx | 2
vcl/source/control/quickselectionengine.cxx | 2
vcl/source/filter/wmf/emfwr.cxx | 4
vcl/source/filter/wmf/emfwr.hxx | 4
writerfilter/inc/ooxml/OOXMLDocument.hxx | 6
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 22 +-
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 8
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 28 +-
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 14 -
75 files changed, 282 insertions(+), 227 deletions(-)
New commits:
commit f3d9aab8410c00298f29ca0194c5d33d53c63ff2
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 5 09:46:12 2016 +0200
teach passstuffbyref plugin to check for..
unnecessarily passing primitives by const ref.
Suggested by Tor Lillqvist
Change-Id: I445e220542969ca3e252581e5953fb01cb2b2be6
Reviewed-on: https://gerrit.libreoffice.org/24672
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basic/source/classes/codecompletecache.cxx b/basic/source/classes/codecompletecache.cxx
index 4c97310..0ea913a 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -42,7 +42,7 @@ bool CodeCompleteOptions::IsCodeCompleteOn()
return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsCodeCompleteOn;
}
-void CodeCompleteOptions::SetCodeCompleteOn( const bool& b )
+void CodeCompleteOptions::SetCodeCompleteOn( bool b )
{
theCodeCompleteOptions::get().bIsCodeCompleteOn = b;
}
@@ -52,7 +52,7 @@ bool CodeCompleteOptions::IsExtendedTypeDeclaration()
return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bExtendedTypeDeclarationOn;
}
-void CodeCompleteOptions::SetExtendedTypeDeclaration( const bool& b )
+void CodeCompleteOptions::SetExtendedTypeDeclaration( bool b )
{
theCodeCompleteOptions::get().bExtendedTypeDeclarationOn = b;
}
@@ -62,7 +62,7 @@ bool CodeCompleteOptions::IsProcedureAutoCompleteOn()
return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsProcedureAutoCompleteOn;
}
-void CodeCompleteOptions::SetProcedureAutoCompleteOn( const bool& b )
+void CodeCompleteOptions::SetProcedureAutoCompleteOn( bool b )
{
theCodeCompleteOptions::get().bIsProcedureAutoCompleteOn = b;
}
@@ -72,7 +72,7 @@ bool CodeCompleteOptions::IsAutoCloseQuotesOn()
return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsAutoCloseQuotesOn;
}
-void CodeCompleteOptions::SetAutoCloseQuotesOn( const bool& b )
+void CodeCompleteOptions::SetAutoCloseQuotesOn( bool b )
{
theCodeCompleteOptions::get().bIsAutoCloseQuotesOn = b;
}
@@ -82,7 +82,7 @@ bool CodeCompleteOptions::IsAutoCloseParenthesisOn()
return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsAutoCloseParenthesisOn;
}
-void CodeCompleteOptions::SetAutoCloseParenthesisOn( const bool& b )
+void CodeCompleteOptions::SetAutoCloseParenthesisOn( bool b )
{
theCodeCompleteOptions::get().bIsAutoCloseParenthesisOn = b;
}
@@ -92,7 +92,7 @@ bool CodeCompleteOptions::IsAutoCorrectOn()
return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsAutoCorrectOn;
}
-void CodeCompleteOptions::SetAutoCorrectOn( const bool& b )
+void CodeCompleteOptions::SetAutoCorrectOn( bool b )
{
theCodeCompleteOptions::get().bIsAutoCorrectOn = b;
}
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 87af412..477c30d 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -310,7 +310,7 @@ void SbiParser::StmntBlock( SbiToken eEnd )
}
}
-void SbiParser::SetCodeCompleting( const bool& b )
+void SbiParser::SetCodeCompleting( bool b )
{
bCodeCompleting = b;
}
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index fa60d6d..b2a44db 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -81,7 +81,7 @@ public:
SbiParser( StarBASIC*, SbModule* );
bool Parse();
- void SetCodeCompleting( const bool& b );
+ void SetCodeCompleting( bool b );
bool IsCodeCompleting() const { return bCodeCompleting;}
SbiExprNode* GetWithVar();
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index aaf3030..c58e0b9 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -688,7 +688,7 @@ void SbxValue::PutErr( sal_uInt16 n )
PUT( PutByte, SbxBYTE, sal_uInt8, nByte )
PUT( PutChar, SbxCHAR, sal_Unicode, nChar )
-PUT( PutCurrency, SbxCURRENCY, const sal_Int64&, nInt64 )
+PUT( PutCurrency, SbxCURRENCY, sal_Int64, nInt64 )
PUT( PutDouble, SbxDOUBLE, double, nDouble )
PUT( PutInteger, SbxINTEGER, sal_Int16, nInteger )
PUT( PutLong, SbxLONG, sal_Int32, nLong )
diff --git a/compilerplugins/clang/passstuffbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx
index c30b6fb..a14d01f 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -42,11 +42,18 @@ public:
bool VisitLambdaExpr(const LambdaExpr * expr);
private:
+ void checkParams(const FunctionDecl * functionDecl);
+ void checkReturnValue(const FunctionDecl * functionDecl, const CXXMethodDecl * methodDecl);
bool isFat(QualType type);
+ bool isPrimitiveConstRef(QualType type);
bool mbInsideFunctionDecl;
bool mbFoundDisqualifier;
};
+bool startswith(const std::string& rStr, const char* pSubStr) {
+ return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
+}
+
bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
if (ignoreLocation(functionDecl)) {
return true;
@@ -59,31 +66,60 @@ bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
if (methodDecl && methodDecl->size_overridden_methods() > 0) {
return true;
}
+
+ checkParams(functionDecl);
+ checkReturnValue(functionDecl, methodDecl);
+ return true;
+}
+
+void PassStuffByRef::checkParams(const FunctionDecl * functionDecl) {
// only warn on the definition/prototype of the function,
// not on the function implementation
- if (!functionDecl->isThisDeclarationADefinition())
- {
- unsigned n = functionDecl->getNumParams();
- for (unsigned i = 0; i != n; ++i) {
- const ParmVarDecl * pvDecl = functionDecl->getParamDecl(i);
- auto const t = pvDecl->getType();
- if (isFat(t)) {
- report(
- DiagnosticsEngine::Warning,
- ("passing %0 by value, rather pass by const lvalue reference"),
- pvDecl->getLocation())
- << t << pvDecl->getSourceRange();
- }
+ if (functionDecl->isThisDeclarationADefinition()) {
+ return;
+ }
+ unsigned n = functionDecl->getNumParams();
+ for (unsigned i = 0; i != n; ++i) {
+ const ParmVarDecl * pvDecl = functionDecl->getParamDecl(i);
+ auto const t = pvDecl->getType();
+ if (isFat(t)) {
+ report(
+ DiagnosticsEngine::Warning,
+ ("passing %0 by value, rather pass by const lvalue reference"),
+ pvDecl->getLocation())
+ << t << pvDecl->getSourceRange();
}
- return true;
}
+ // ignore stuff that forms part of the stable URE interface
+ if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(
+ functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) {
+ return;
+ }
+ // these functions are passed as parameters to another function
+ std::string aFunctionName = functionDecl->getQualifiedNameAsString();
+ if (startswith(aFunctionName, "slideshow::internal::ShapeAttributeLayer")) {
+ return;
+ }
+ for (unsigned i = 0; i != n; ++i) {
+ const ParmVarDecl * pvDecl = functionDecl->getParamDecl(i);
+ auto const t = pvDecl->getType();
+ if (isPrimitiveConstRef(t)) {
+ report(
+ DiagnosticsEngine::Warning,
+ ("passing primitive type param %0 by const &, rather pass by value"),
+ pvDecl->getLocation())
+ << t << pvDecl->getSourceRange();
+ }
+ }
+}
+void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const CXXMethodDecl * methodDecl) {
if (methodDecl && methodDecl->isVirtual()) {
- return true;
+ return;
}
if( !functionDecl->hasBody()) {
- return true;
+ return;
}
const QualType type = functionDecl->getReturnType().getDesugaredType(compiler.getASTContext());
@@ -91,37 +127,37 @@ bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
|| type->isTemplateTypeParmType() || type->isDependentType() || type->isBuiltinType()
|| type->isScalarType())
{
- return true;
+ return;
}
// ignore stuff that forms part of the stable URE interface
if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(
functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) {
- return true;
+ return;
}
std::string aFunctionName = functionDecl->getQualifiedNameAsString();
// function is passed as parameter to another function
if (aFunctionName == "GDIMetaFile::ImplColMonoFnc"
|| aFunctionName == "editeng::SvxBorderLine::darkColor"
|| aFunctionName.compare(0, 8, "xforms::") == 0)
- return true;
+ return;
// not sure how to exclude this yet, returns copy of one of it's params
if (aFunctionName == "sameDistColor" || aFunctionName == "sameColor"
|| aFunctionName == "pcr::(anonymous namespace)::StringIdentity::operator()"
|| aFunctionName == "matop::COp<type-parameter-0-0, svl::SharedString>::operator()"
|| aFunctionName == "slideshow::internal::accumulate"
|| aFunctionName == "slideshow::internal::lerp")
- return true;
+ return;
// depends on a define
if (aFunctionName == "SfxObjectShell::GetSharedFileURL")
- return true;
+ return;
mbInsideFunctionDecl = true;
mbFoundDisqualifier = false;
TraverseStmt(functionDecl->getBody());
mbInsideFunctionDecl = false;
if (mbFoundDisqualifier)
- return true;
+ return;
report(
DiagnosticsEngine::Warning,
@@ -138,8 +174,6 @@ bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
functionDecl->getCanonicalDecl()->getSourceRange().getBegin())
<< functionDecl->getCanonicalDecl()->getSourceRange();
}
- //functionDecl->dump();
- return true;
}
bool PassStuffByRef::VisitLambdaExpr(const LambdaExpr * expr) {
@@ -185,6 +219,27 @@ bool PassStuffByRef::isFat(QualType type) {
&& compiler.getASTContext().getTypeSizeInChars(t2).getQuantity() > 64;
}
+bool PassStuffByRef::isPrimitiveConstRef(QualType type) {
+ if (type->isIncompleteType()) {
+ return false;
+ }
+ if (!type->isReferenceType()) {
+ return false;
+ }
+ const clang::ReferenceType* referenceType = dyn_cast<ReferenceType>(type);
+ QualType pointeeQT = referenceType->getPointeeType();
+ if (!pointeeQT.isConstQualified()) {
+ return false;
+ }
+ if (!pointeeQT->isFundamentalType()) {
+ return false;
+ }
+ // ignore double for now, some of our code seems to believe it is cheaper to pass by ref
+ const BuiltinType* builtinType = dyn_cast<BuiltinType>(pointeeQT);
+ return builtinType->getKind() != BuiltinType::Kind::Double;
+}
+
+
loplugin::Plugin::Registration< PassStuffByRef > X("passstuffbyref");
}
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index f7473f5..4a8f02c 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -533,7 +533,7 @@ ORowSetValue& ORowSetValue::operator=(const OUString& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const double& _rRH)
+ORowSetValue& ORowSetValue::operator=(double _rRH)
{
if(m_eTypeKind != DataType::DOUBLE)
free();
@@ -545,7 +545,7 @@ ORowSetValue& ORowSetValue::operator=(const double& _rRH)
return *this;
}
-ORowSetValue& ORowSetValue::operator=(const float& _rRH)
+ORowSetValue& ORowSetValue::operator=(float _rRH)
{
if(m_eTypeKind != DataType::FLOAT)
free();
@@ -558,7 +558,7 @@ ORowSetValue& ORowSetValue::operator=(const float& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const sal_Int8& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_Int8 _rRH)
{
if(m_eTypeKind != DataType::TINYINT )
free();
@@ -571,7 +571,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int8& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const sal_uInt8& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_uInt8 _rRH)
{
if(m_eTypeKind != DataType::TINYINT )
free();
@@ -584,7 +584,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt8& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const sal_Int16& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_Int16 _rRH)
{
if(m_eTypeKind != DataType::SMALLINT )
free();
@@ -598,7 +598,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int16& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const sal_uInt16& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_uInt16 _rRH)
{
if(m_eTypeKind != DataType::SMALLINT )
free();
@@ -612,7 +612,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt16& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const sal_Int32& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_Int32 _rRH)
{
if(m_eTypeKind != DataType::INTEGER )
free();
@@ -627,7 +627,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int32& _rRH)
}
-ORowSetValue& ORowSetValue::operator=(const sal_uInt32& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_uInt32 _rRH)
{
if(m_eTypeKind != DataType::INTEGER )
free();
@@ -654,7 +654,7 @@ ORowSetValue& ORowSetValue::operator=(const bool _rRH)
return *this;
}
-ORowSetValue& ORowSetValue::operator=(const sal_Int64& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_Int64 _rRH)
{
if ( DataType::BIGINT != m_eTypeKind)
free();
@@ -667,7 +667,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int64& _rRH)
return *this;
}
-ORowSetValue& ORowSetValue::operator=(const sal_uInt64& _rRH)
+ORowSetValue& ORowSetValue::operator=(sal_uInt64 _rRH)
{
if ( DataType::BIGINT != m_eTypeKind)
free();
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 6dc4681..1febff0 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -67,11 +67,11 @@ namespace connectivity
private:
/// returns the basic error message associated with the given error condition, without any parameter replacements
OUString
- impl_getErrorMessage( const ErrorCondition& _eCondition );
+ impl_getErrorMessage( ErrorCondition _eCondition );
/// returns the SQLState associated with the given error condition
OUString
- impl_getSQLState( const ErrorCondition& _eCondition );
+ impl_getSQLState( ErrorCondition _eCondition );
/// returns an SQLException describing the given error condition
SQLException
@@ -224,7 +224,7 @@ namespace connectivity
}
- OUString SQLError_Impl::impl_getErrorMessage( const ErrorCondition& _eCondition )
+ OUString SQLError_Impl::impl_getErrorMessage( ErrorCondition _eCondition )
{
OUStringBuffer aMessage;
@@ -239,7 +239,7 @@ namespace connectivity
}
- OUString SQLError_Impl::impl_getSQLState( const ErrorCondition& _eCondition )
+ OUString SQLError_Impl::impl_getSQLState( ErrorCondition _eCondition )
{
OUString sState;
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index e991a13..7ba386e 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -134,7 +134,7 @@ static void RGBtoCMYK( double dR, double dG, double dB, double& fCyan, double& f
class HexColorControl : public Edit
{
public:
- HexColorControl( vcl::Window* pParent, const WinBits& nStyle );
+ HexColorControl( vcl::Window* pParent, WinBits nStyle );
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
virtual void Paste() override;
@@ -146,7 +146,7 @@ private:
static bool ImplProcessKeyInput( const KeyEvent& rKEv );
};
-HexColorControl::HexColorControl( vcl::Window* pParent, const WinBits& nStyle )
+HexColorControl::HexColorControl( vcl::Window* pParent, WinBits nStyle )
: Edit(pParent, nStyle)
{
SetMaxTextLen( 6 );
@@ -256,7 +256,7 @@ bool HexColorControl::ImplProcessKeyInput( const KeyEvent& rKEv )
class ColorPreviewControl : public Control
{
public:
- ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle );
+ ColorPreviewControl( vcl::Window* pParent, WinBits nStyle );
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
@@ -266,7 +266,7 @@ private:
Color maColor;
};
-ColorPreviewControl::ColorPreviewControl(vcl::Window* pParent, const WinBits& nStyle)
+ColorPreviewControl::ColorPreviewControl(vcl::Window* pParent, WinBits nStyle)
: Control(pParent, nStyle)
{
}
@@ -304,7 +304,7 @@ const ColorMode DefaultMode = HUE;
class ColorFieldControl : public Control
{
public:
- ColorFieldControl(vcl::Window* pParent, const WinBits& nStyle);
+ ColorFieldControl(vcl::Window* pParent, WinBits nStyle);
virtual ~ColorFieldControl();
virtual void dispose() override;
@@ -346,7 +346,7 @@ private:
std::vector<sal_uInt16> maPercent_Vert;
};
-ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle )
+ColorFieldControl::ColorFieldControl( vcl::Window* pParent, WinBits nStyle )
: Control( pParent, nStyle )
, meMode( DefaultMode )
, mdX( -1.0 )
@@ -715,7 +715,7 @@ void ColorFieldControl::UpdatePosition()
class ColorSliderControl : public Control
{
public:
- ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle );
+ ColorSliderControl( vcl::Window* pParent, WinBits nStyle );
virtual ~ColorSliderControl();
virtual void dispose() override;
@@ -748,7 +748,7 @@ private:
double mdValue;
};
-ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle )
+ColorSliderControl::ColorSliderControl( vcl::Window* pParent, WinBits nStyle )
: Control( pParent, nStyle )
, meMode( DefaultMode )
, mpBitmap( nullptr )
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 7c89d71..2a08d66 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -64,7 +64,7 @@ public:
sal_Int32 m_nType;
sal_Int32 m_nFlags;
- OSaveAsDlgImpl( OSaveAsDlg* pParent,const sal_Int32& _rType,
+ OSaveAsDlgImpl( OSaveAsDlg* pParent, sal_Int32 _rType,
const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
const OUString& rDefault,
const IObjectNameCheck& _rObjectNameCheck,
@@ -78,7 +78,7 @@ public:
} // dbaui
OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent,
- const sal_Int32& _rType,
+ sal_Int32 _rType,
const Reference< XConnection>& _xConnection,
const OUString& rDefault,
const IObjectNameCheck& _rObjectNameCheck,
@@ -170,7 +170,7 @@ void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxCon
}
OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,
- const sal_Int32& _rType,
+ sal_Int32 _rType,
const Reference< XComponentContext >& _rxContext,
const Reference< XConnection>& _xConnection,
const OUString& rDefault,
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index 19faa09..f4cd5ce 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx
@@ -74,10 +74,10 @@ namespace dbaui
void SetType(const TOTypeInfoSP& _pType);
void SetTypeValue(sal_Int32 _nType);
void SetTypeName(const OUString& _sTypeName);
- void SetPrecision(const sal_Int32& _rPrecision);
- void SetScale(const sal_Int32& _rScale);
- void SetIsNullable(const sal_Int32& _rIsNullable);
- void SetFormatKey(const sal_Int32& _rFormatKey);
+ void SetPrecision(sal_Int32 _rPrecision);
+ void SetScale(sal_Int32 _rScale);
+ void SetIsNullable(sal_Int32 _rIsNullable);
+ void SetFormatKey(sal_Int32 _rFormatKey);
void SetHorJustify(const SvxCellHorJustify& _rHorJustify);
void SetAutoIncrement(bool _bAuto);
void SetPrimaryKey(bool _bPKey);
diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx
index 782887e..93491a2 100644
--- a/dbaccess/source/ui/inc/IUpdateHelper.hxx
+++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx
@@ -30,7 +30,7 @@ namespace dbaui
public:
virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) = 0;
virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) = 0;
- virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) = 0;
+ virtual void updateInt(sal_Int32 _nPos, sal_Int32 _nValue) = 0;
virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) = 0;
virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) = 0;
virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) = 0;
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 0340ca2..18a6c2d 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -180,7 +180,7 @@ namespace dbaui
@param css::awt::TextAlign& _nAlignment
@return the corresponding SvxCellHorJustify
*/
- SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment);
+ SvxCellHorJustify mapTextJustify(sal_Int32 _nAlignment);
/** call the format dialog and set the selected format at the column
@param _xAffectedCol Font to be converted
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index e01d3d2..e20cec7 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -52,7 +52,7 @@ namespace dbaui
OSaveAsDlgImpl* m_pImpl;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- OSaveAsDlg( vcl::Window * pParent,const sal_Int32& _rType,
+ OSaveAsDlg( vcl::Window * pParent, sal_Int32 _rType,
const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
const OUString& rDefault,
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index abde970..1029b77 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -735,7 +735,7 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment)
return nAlignment;
}
-SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment)
+SvxCellHorJustify mapTextJustify(sal_Int32 _nAlignment)
{
SvxCellHorJustify eJustify = SVX_HOR_JUSTIFY_LEFT;
switch (_nAlignment)
diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
index 54f9569..4d3d827 100644
--- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
+++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
@@ -60,7 +60,7 @@ namespace dbaui
{
m_xRowUpdate->updateTimestamp(_nPos, _nValue);
}
- virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) override
+ virtual void updateInt(sal_Int32 _nPos, sal_Int32 _nValue) override
{
m_xRowUpdate->updateInt(_nPos, _nValue);
}
@@ -110,7 +110,7 @@ namespace dbaui
{
m_xParameters->setTimestamp(_nPos, _nValue);
}
- virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) override
+ virtual void updateInt(sal_Int32 _nPos, sal_Int32 _nValue) override
{
m_xParameters->setInt(_nPos, _nValue);
}
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 7b92318..52cb059 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -363,7 +363,7 @@ void OFieldDescription::SetTypeValue(sal_Int32 _nType)
}
}
-void OFieldDescription::SetPrecision(const sal_Int32& _rPrecision)
+void OFieldDescription::SetPrecision(sal_Int32 _rPrecision)
{
try
{
@@ -378,7 +378,7 @@ void OFieldDescription::SetPrecision(const sal_Int32& _rPrecision)
}
}
-void OFieldDescription::SetScale(const sal_Int32& _rScale)
+void OFieldDescription::SetScale(sal_Int32 _rScale)
{
try
{
@@ -393,7 +393,7 @@ void OFieldDescription::SetScale(const sal_Int32& _rScale)
}
}
-void OFieldDescription::SetIsNullable(const sal_Int32& _rIsNullable)
+void OFieldDescription::SetIsNullable(sal_Int32 _rIsNullable)
{
try
{
@@ -408,7 +408,7 @@ void OFieldDescription::SetIsNullable(const sal_Int32& _rIsNullable)
}
}
-void OFieldDescription::SetFormatKey(const sal_Int32& _rFormatKey)
+void OFieldDescription::SetFormatKey(sal_Int32 _rFormatKey)
{
try
{
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index 591daf9..07e6c37 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -52,22 +52,22 @@ public:
CodeCompleteOptions();
static bool IsCodeCompleteOn();
- static void SetCodeCompleteOn( const bool& b );
+ static void SetCodeCompleteOn( bool b );
static bool IsExtendedTypeDeclaration();
- static void SetExtendedTypeDeclaration( const bool& b );
+ static void SetExtendedTypeDeclaration( bool b );
static bool IsProcedureAutoCompleteOn();
- static void SetProcedureAutoCompleteOn( const bool& b );
+ static void SetProcedureAutoCompleteOn( bool b );
static bool IsAutoCloseQuotesOn();
- static void SetAutoCloseQuotesOn( const bool& b );
+ static void SetAutoCloseQuotesOn( bool b );
static bool IsAutoCloseParenthesisOn();
- static void SetAutoCloseParenthesisOn( const bool& b );
+ static void SetAutoCloseParenthesisOn( bool b );
static bool IsAutoCorrectOn();
- static void SetAutoCorrectOn( const bool& b );
+ static void SetAutoCorrectOn( bool b );
};
class BASIC_DLLPUBLIC CodeCompleteDataCache
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 4892121..13178fa 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -176,7 +176,7 @@ public:
void PutDecimal( css::bridge::oleautomation::Decimal& rAutomationDec );
bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed for Windows build, don't remove
void fillAutomationDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ) const;
- bool PutCurrency( const sal_Int64& );
+ bool PutCurrency( sal_Int64 );
// Interface for CDbl in Basic
static SbxError ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false );
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index c78f3c7..a25989c 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -288,22 +288,22 @@ namespace connectivity
ORowSetValue& operator=(const ORowSetValue& _rRH);
// simple types
- ORowSetValue& operator=(const bool _rRH);
+ ORowSetValue& operator=(bool _rRH);
- ORowSetValue& operator=(const sal_Int8& _rRH);
- ORowSetValue& operator=(const sal_uInt8& _rRH);
+ ORowSetValue& operator=(sal_Int8 _rRH);
+ ORowSetValue& operator=(sal_uInt8 _rRH);
- ORowSetValue& operator=(const sal_Int16& _rRH);
- ORowSetValue& operator=(const sal_uInt16& _rRH);
+ ORowSetValue& operator=(sal_Int16 _rRH);
+ ORowSetValue& operator=(sal_uInt16 _rRH);
- ORowSetValue& operator=(const sal_Int32& _rRH);
- ORowSetValue& operator=(const sal_uInt32& _rRH);
+ ORowSetValue& operator=(sal_Int32 _rRH);
+ ORowSetValue& operator=(sal_uInt32 _rRH);
- ORowSetValue& operator=(const sal_Int64& _rRH);
- ORowSetValue& operator=(const sal_uInt64& _rRH);
+ ORowSetValue& operator=(sal_Int64 _rRH);
+ ORowSetValue& operator=(sal_uInt64 _rRH);
- ORowSetValue& operator=(const double& _rRH);
- ORowSetValue& operator=(const float& _rRH);
+ ORowSetValue& operator=(double _rRH);
+ ORowSetValue& operator=(float _rRH);
// ADT's
ORowSetValue& operator=(const css::util::Date& _rRH);
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index adc16db..e7ac85c 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -447,8 +447,8 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimit
const DiagStyle& rRFromBL, /// Diagonal frame border from bottom-left to right end of rBorder.
const Color* pForceColor = nullptr,/// If specified, overrides frame border color.
- const long& rRotationT = 9000, /// Angle of the top slanted frames in 100th of degree
- const long& rRotationB = 9000 /// Angle of the bottom slanted frames in 100th of degree
+ const long rRotationT = 9000, /// Angle of the top slanted frames in 100th of degree
+ const long rRotationB = 9000 /// Angle of the bottom slanted frames in 100th of degree
);
SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives(
@@ -465,8 +465,8 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimit
const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder.
const Color* pForceColor = nullptr,/// If specified, overrides frame border color.
- const long& rRotationT = 9000, /// Angle of the top slanted frame in 100th of degrees
- const long& rRotationB = 9000 /// Angle of the bottom slanted frame in 100th of degrees
+ const long rRotationT = 9000, /// Angle of the top slanted frame in 100th of degrees
+ const long rRotationB = 9000 /// Angle of the bottom slanted frame in 100th of degrees
);
SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateClippedBorderPrimitives (
diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx
index 228ac4e..66826df 100644
--- a/include/tools/datetime.hxx
+++ b/include/tools/datetime.hxx
@@ -105,7 +105,7 @@ public:
DateTime& operator =( const DateTime& rDateTime );
void GetWin32FileDateTime( sal_uInt32 & rLower, sal_uInt32 & rUpper );
- static DateTime CreateFromWin32FileDateTime( const sal_uInt32 & rLower, const sal_uInt32 & rUpper );
+ static DateTime CreateFromWin32FileDateTime( sal_uInt32 rLower, sal_uInt32 rUpper );
};
inline DateTime& DateTime::operator =( const DateTime& rDateTime )
diff --git a/include/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx
index c78115e..e59f9da 100644
--- a/include/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -51,7 +51,7 @@ public:
* @param lCertificateValidity contains a bitmask which validation error occur.
* @param pCertificate contains the server certificate.
*/
- SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity,
+ SimpleCertificateValidationRequest( sal_Int32 lCertificateValidity,
const css::uno::Reference<css::security::XCertificate>& certificate,
const OUString & hostname );
};
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 3276e3e..c480e46 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -271,7 +271,7 @@ public:
virtual bool set_property(const OString &rKey, const OString &rValue) override;
- void EnableQuickSelection( const bool& b );
+ void EnableQuickSelection( bool b );
static sal_Int32 NaturalSortCompare(const OUString &rA, const OUString &rB);
};
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 2eba249..daa6bee 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -73,7 +73,7 @@ namespace vcl
bool HandleKeyEvent( const KeyEvent& _rKEvt );
void Reset();
- void SetEnabled( const bool& b );
+ void SetEnabled( bool b );
private:
::std::unique_ptr< QuickSelectionEngine_Data > m_pData;
diff --git a/lotuswordpro/source/filter/lwpmargins.hxx b/lotuswordpro/source/filter/lwpmargins.hxx
index d0e74dd..e836617 100644
--- a/lotuswordpro/source/filter/lwpmargins.hxx
+++ b/lotuswordpro/source/filter/lwpmargins.hxx
@@ -79,7 +79,7 @@ public:
pStrm->SkipExtra();
}
inline LwpMargins& operator = (const LwpMargins& rOther);
- inline double GetMarginsValue(const sal_uInt8& nWhichSide);
+ inline double GetMarginsValue(sal_uInt8 nWhichSide);
private:
sal_Int32 m_nLeft;
sal_Int32 m_nTop;
@@ -96,7 +96,7 @@ inline LwpMargins& LwpMargins::operator = (const LwpMargins& rOther)
return *this;
}
-inline double LwpMargins::GetMarginsValue(const sal_uInt8& nWhichSide)
+inline double LwpMargins::GetMarginsValue(sal_uInt8 nWhichSide)
{
switch (nWhichSide)
{
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 09acda7..ee7031a 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -469,7 +469,7 @@ OUString LwpStory::RegisterFirstFribStyle()
return sName;
}
-bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos)
+bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, sal_uInt8 nPos)
{
std::vector <NamePosPair>::reverse_iterator rIter;
for (rIter = m_vBulletStyleNameList.rbegin(); rIter != m_vBulletStyleNameList.rend(); ++rIter)
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index 1d43ab1..ccd262f 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -129,8 +129,8 @@ public:
LwpPara* GetLastParaOfPreviousStory();
OUString GetContentText(bool bAllText = false);
- inline void AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos);
- bool IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos);
+ inline void AddBullStyleName2List(const OUString& rStyleName, sal_uInt8 nPos);
+ bool IsBullStyleUsedBefore(const OUString& rStyleName, sal_uInt8 nPos);
OUString RegisterFirstFribStyle();
};
@@ -165,7 +165,7 @@ void LwpStory::SetSectionName(const OUString& StyleName)
{
m_CurrSectionName = StyleName;
}
-inline void LwpStory::AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos)
+inline void LwpStory::AddBullStyleName2List(const OUString& rStyleName, sal_uInt8 nPos)
{
m_vBulletStyleNameList.push_back(std::make_pair(rStyleName, nPos));
}
diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx
index c5d11e6..9e2e72d 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/source/filter/lwptools.hxx
@@ -90,9 +90,9 @@ public:
OUString& str, sal_uInt16 strlen, rtl_TextEncoding aEncoding );
static bool IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len);
- inline static double ConvertFromUnits(const sal_Int32& nUnits);
+ inline static double ConvertFromUnits(sal_Int32 nUnits);
inline static double ConvertToMetric(const double& fInch);
- inline static double ConvertFromUnitsToMetric(const sal_Int32& nUnits);
+ inline static double ConvertFromUnitsToMetric(sal_Int32 nUnits);
inline static bool IsOddNumber(sal_uInt16& nNumber);
inline static bool IsEvenNumber(sal_uInt16& nNumber);
@@ -105,7 +105,7 @@ public:
static XFTimeStyle* GetSystemTimeStyle();
};
-inline double LwpTools::ConvertFromUnits(const sal_Int32& nUnits)
+inline double LwpTools::ConvertFromUnits(sal_Int32 nUnits)
{
return (double)nUnits/UNITS_PER_INCH;
}
@@ -113,7 +113,7 @@ inline double LwpTools::ConvertToMetric(const double& fInch)
{
return fInch*CM_PER_INCH;
}
-inline double LwpTools::ConvertFromUnitsToMetric(const sal_Int32& nUnits)
+inline double LwpTools::ConvertFromUnitsToMetric(sal_Int32 nUnits)
{
double fInch = ConvertFromUnits(nUnits);
return ConvertToMetric(fInch);
diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx
index 1acb009..e2de24b 100644
--- a/oox/inc/drawingml/texteffectscontext.hxx
+++ b/oox/inc/drawingml/texteffectscontext.hxx
@@ -40,7 +40,7 @@ protected:
private:
void processAttributes(const AttributeList& rAttribs);
- void pushAttributeToGrabBag (const sal_Int32& aAttributeId, const OUString& rElementName, const AttributeList& rAttribs);
+ void pushAttributeToGrabBag (sal_Int32 aAttributeId, const OUString& rElementName, const AttributeList& rAttribs);
};
} }
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx
index 01ad195..7b7f32e 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -121,7 +121,7 @@ TextEffectsContext::~TextEffectsContext()
{
}
-void TextEffectsContext::pushAttributeToGrabBag (const sal_Int32& aAttributeId, const OUString& rElementName, const AttributeList& rAttribs)
+void TextEffectsContext::pushAttributeToGrabBag (sal_Int32 aAttributeId, const OUString& rElementName, const AttributeList& rAttribs)
{
if (!rAttribs.hasAttribute(aAttributeId))
return;
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index e0a4374..e8c404b 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -97,7 +97,7 @@ namespace reportdesign
OReportDefinition& operator=(const OReportDefinition&) = delete;
void setSection( const OUString& _sProperty
- ,const bool& _bOn
+ ,bool _bOn
,const OUString& _sName
,css::uno::Reference< css::report::XSection>& _member);
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index fb62e43..7f75c28 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -293,7 +293,7 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName
}
void OGroup::setSection( const OUString& _sProperty
- ,const bool& _bOn
+ ,bool _bOn
,const OUString& _sName
,uno::Reference< report::XSection>& _member)
{
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 8626105..6addf6d 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1051,7 +1051,7 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t
}
void OReportDefinition::setSection( const OUString& _sProperty
- ,const bool& _bOn
+ ,bool _bOn
,const OUString& _sName
,uno::Reference< report::XSection>& _member)
{
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index e435030..2762e8a 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -42,7 +42,7 @@ uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInt
void throwIllegallArgumentException( const OUString& _sTypeName
,const uno::Reference< uno::XInterface >& ExceptionContext_
- ,const ::sal_Int16& ArgumentPosition_
+ ,sal_Int16 ArgumentPosition_
,const css::uno::Reference< css::uno::XComponentContext >& Context_
)
{
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 2232701..9099580 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -85,7 +85,7 @@ namespace reportdesign
l.notify();
}
void setSection( const OUString& _sProperty
- ,const bool& _bOn
+ ,bool _bOn
,const OUString& _sName
,css::uno::Reference< css::report::XSection>& _member);
protected:
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index e64bb93..5b80366 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -59,7 +59,7 @@ namespace reportdesign
*/
void throwIllegallArgumentException(const OUString& _sTypeName
,const css::uno::Reference< css::uno::XInterface >& ExceptionContext_
- ,const ::sal_Int16& ArgumentPosition_
+ ,sal_Int16 ArgumentPosition_
,const css::uno::Reference< css::uno::XComponentContext >& Context_);
/** clones the given object
diff --git a/sc/inc/reordermap.hxx b/sc/inc/reordermap.hxx
index b7c5dfc..b7bb5d5 100644
--- a/sc/inc/reordermap.hxx
+++ b/sc/inc/reordermap.hxx
@@ -29,7 +29,7 @@ public:
std::pair<iterator, bool>
insert( DataType::value_type const& val );
- const_iterator find( DataType::key_type const& key ) const;
+ const_iterator find( DataType::key_type key ) const;
};
}
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f9fff87..3906e70 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1014,7 +1014,7 @@ private:
bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc);
bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
- const SCCOL& nLastCol, const SCROW& nLastRow,
+ SCCOL nLastCol, SCROW nLastRow,
const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc);
bool SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMark,
ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc);
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index deb8fc4..c54812a 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -290,7 +290,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
}
bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
- const SCCOL& nLastCol, const SCROW& nLastRow,
+ SCCOL nLastCol, SCROW nLastRow,
const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc)
{
bool bFound = false;
diff --git a/sc/source/core/tool/reordermap.cxx b/sc/source/core/tool/reordermap.cxx
index 0aecc89..b9754df 100644
--- a/sc/source/core/tool/reordermap.cxx
+++ b/sc/source/core/tool/reordermap.cxx
@@ -23,7 +23,7 @@ ColRowReorderMapType::insert( ColRowReorderMapType::value_type const& val )
}
ColRowReorderMapType::const_iterator
-ColRowReorderMapType::find( DataType::key_type const& key ) const
+ColRowReorderMapType::find( DataType::key_type key ) const
{
return maData.find(key);
}
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 46163fa..8c57961d 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -347,7 +347,7 @@ void ScfPropSetHelper::WriteValue( const Any& rAny )
*pAny = rAny;
}
-void ScfPropSetHelper::WriteValue( const bool& rbValue )
+void ScfPropSetHelper::WriteValue( bool rbValue )
{
if( Any* pAny = GetNextAny() )
*pAny <<= rbValue;
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index aa40eff..fa5f404 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -249,7 +249,7 @@ public:
inline void WriteValue( const Color& rColor )
{ WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); }
/** Writes a C++ boolean value to the value sequence. */
- void WriteValue( const bool& rbValue );
+ void WriteValue( bool rbValue );
/** Writes all values to the passed property set. */
void WriteToPropertySet( ScfPropertySet& rPropSet ) const;
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index fc8d363..0b9d1a8 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -166,7 +166,7 @@ ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno
}
}
uno::Any
-ScVbaInterior::GetIndexColor( const sal_Int32& nColorIndex )
+ScVbaInterior::GetIndexColor( sal_Int32 nColorIndex )
{
sal_Int32 nIndex = nColorIndex;
// #FIXME xlColorIndexAutomatic & xlColorIndexNone are not really
diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx
index 5f64f19..02bbeaf 100644
--- a/sc/source/ui/vba/vbainterior.hxx
+++ b/sc/source/ui/vba/vbainterior.hxx
@@ -50,7 +50,7 @@ protected:
static Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern );
static Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans );
static sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans );
- css::uno::Any GetIndexColor( const sal_Int32& nColorIndex );
+ css::uno::Any GetIndexColor( sal_Int32 nColorIndex );
sal_Int32 GetColorIndex( const sal_Int32 nColor );
css::uno::Any GetUserDefinedAttributes( const OUString& sName );
void SetUserDefinedAttributes( const OUString& sName, const css::uno::Any& aValue );
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 3f64061..07c6fde 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -304,7 +304,7 @@ void InformationDialog::InitDialog()
}
-InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
+InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, sal_Int64 rSourceSize, sal_Int64 rDestSize, sal_Int64 rApproxSize ) :
UnoDialog( rxContext, rxFrame ),
ConfigurationAccess( rxContext, nullptr ),
mxActionListener( new OKActionListener( *this ) ),
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 07dcaea..3de345e 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -46,7 +46,7 @@ public:
InformationDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
css::uno::Reference< css::frame::XFrame >& rxFrame, const OUString& rSaveAsURL,
- bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
+ bool& bOpenNewDocument, sal_Int64 nSourceSize, sal_Int64 nDestSize, sal_Int64 nApproxDest );
~InformationDialog();
void execute();
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index b71e71c..96b86bf 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -1017,11 +1017,11 @@ void EventMultiplexer::notifySwitchEraserMode(){
}
//adding erasing all ink features with UserPaintOverlay
-void EventMultiplexer::notifyEraseAllInk( bool const& rEraseAllInk )
+void EventMultiplexer::notifyEraseAllInk( bool bEraseAllInk )
{
mpImpl->maUserPaintEventHandlers.applyAll(
- [&rEraseAllInk]( const UserPaintEventHandlerSharedPtr& pHandler )
- { return pHandler->eraseAllInkChanged( rEraseAllInk ); } );
+ [&bEraseAllInk]( const UserPaintEventHandlerSharedPtr& pHandler )
+ { return pHandler->eraseAllInkChanged( bEraseAllInk ); } );
}
//adding erasing features with UserPaintOverlay
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 68a3a4e..3e720c3 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -161,9 +161,9 @@ namespace slideshow
}
}
- bool eraseAllInkChanged( bool const& rEraseAllInk ) override
+ bool eraseAllInkChanged( bool bEraseAllInk ) override
{
- this->mbIsEraseAllModeActivated= rEraseAllInk;
+ this->mbIsEraseAllModeActivated = bEraseAllInk;
// if the erase all mode is activated it will remove all ink from slide,
// therefore destroy all the polygons stored
if(mbIsEraseAllModeActivated)
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index b1a4a00..5a34fc0 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -111,7 +111,7 @@ public:
virtual ~UserPaintEventHandler() {}
virtual bool colorChanged( RGBColor const& rUserColor ) = 0;
virtual bool widthChanged( double nUserStrokeWidth ) = 0;
- virtual bool eraseAllInkChanged(bool const& rEraseAllInk) =0;
+ virtual bool eraseAllInkChanged(bool bEraseAllInk) =0;
virtual bool eraseInkWidthChanged(sal_Int32 rEraseInkSize) =0;
virtual bool switchEraserMode() = 0;
virtual bool switchPenMode() = 0;
@@ -529,7 +529,7 @@ public:
enabled. User paint denotes the feature to draw colored lines
on top of the slide content.
*/
- void notifyEraseAllInk( bool const& rEraseAllInk );
+ void notifyEraseAllInk( bool bEraseAllInk );
void notifySwitchPenMode();
void notifySwitchEraserMode();
void notifyEraseInkWidth( sal_Int32 rEraseInkSize );
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx
index f65cf05..eccf3ac 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -186,18 +186,18 @@ namespace svgio
basegfx::B2DHomMatrix createMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource) const;
};
- void skip_char(const OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen);
- void skip_char(const OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen);
+ void skip_char(const OUString& rCandidate, sal_Unicode aChar, sal_Int32& nPos, const sal_Int32 nLen);
+ void skip_char(const OUString& rCandidate, sal_Unicode aCharA, sal_Unicode nCharB, sal_Int32& nPos, const sal_Int32 nLen);
void copySign(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
void copyNumber(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
void copyHex(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
void copyString(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
- void copyToLimiter(const OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
+ void copyToLimiter(const OUString& rCandidate, sal_Unicode aLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
bool readNumber(const OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen);
SvgUnit readUnit(const OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen);
bool readNumberAndUnit(const OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen);
bool readAngle(const OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen);
- sal_Int32 read_hex(const sal_Unicode& rChar);
+ sal_Int32 read_hex(sal_Unicode aChar);
bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent);
bool read_color(const OUString& rCandidate, basegfx::BColor& rColor, bool bCaseIndependent, SvgNumber& rOpacity);
basegfx::B2DRange readViewBox(const OUString& rCandidate, InfoProvider& rInfoProvider);
@@ -216,7 +216,7 @@ namespace svgio
void readImageLink(const OUString& rCandidate, OUString& rXLink, OUString& rUrl, OUString& rMimeType, OUString& rData);
- OUString convert(const OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove);
+ OUString convert(const OUString& rCandidate, sal_Unicode nPattern, sal_Unicode nNew, bool bRemove);
OUString consolidateContiguousSpace(const OUString& rCandidate);
OUString whiteSpaceHandlingDefault(const OUString& rCandidate);
OUString whiteSpaceHandlingPreserve(const OUString& rCandidate);
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 3bc4573..b3925c0 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -292,17 +292,17 @@ namespace svgio
return basegfx::fTools::moreOrEqual(mfNumber, 0.0);
}
- void skip_char(const OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen)
+ void skip_char(const OUString& rCandidate, sal_Unicode nChar, sal_Int32& nPos, const sal_Int32 nLen)
{
- while(nPos < nLen && rChar == rCandidate[nPos])
+ while(nPos < nLen && nChar == rCandidate[nPos])
{
nPos++;
}
}
- void skip_char(const OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen)
+ void skip_char(const OUString& rCandidate, sal_Unicode nCharA, sal_Unicode nCharB, sal_Int32& nPos, const sal_Int32 nLen)
{
- while(nPos < nLen && (rCharA == rCandidate[nPos] || rCharB == rCandidate[nPos]))
+ while(nPos < nLen && (nCharA == rCandidate[nPos] || nCharB == rCandidate[nPos]))
{
nPos++;
}
@@ -380,9 +380,9 @@ namespace svgio
}
}
- void copyToLimiter(const OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen)
+ void copyToLimiter(const OUString& rCandidate, sal_Unicode nLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen)
{
- while(nPos < nLen && rLimiter != rCandidate[nPos])
+ while(nPos < nLen && nLimiter != rCandidate[nPos])
{
rTarget.append(rCandidate[nPos]);
nPos++;
@@ -622,19 +622,19 @@ namespace svgio
return false;
}
- sal_Int32 read_hex(const sal_Unicode& rChar)
+ sal_Int32 read_hex(sal_Unicode nChar)
{
- if(rChar >= '0' && rChar <= '9')
+ if(nChar >= '0' && nChar <= '9')
{
- return sal_Int32(rChar - sal_Unicode('0'));
+ return sal_Int32(nChar - sal_Unicode('0'));
}
- else if(rChar >= 'A' && rChar <= 'F')
+ else if(nChar >= 'A' && nChar <= 'F')
{
- return 10 + sal_Int32(rChar - sal_Unicode('A'));
+ return 10 + sal_Int32(nChar - sal_Unicode('A'));
}
- else if(rChar >= 'a' && rChar <= 'f')
+ else if(nChar >= 'a' && nChar <= 'f')
{
- return 10 + sal_Int32(rChar - sal_Unicode('a'));
+ return 10 + sal_Int32(nChar - sal_Unicode('a'));
}
else
{
@@ -1514,7 +1514,7 @@ namespace svgio
}
}
- OUString convert(const OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove)
+ OUString convert(const OUString& rCandidate, sal_Unicode nPattern, sal_Unicode nNew, bool bRemove)
{
const sal_Int32 nLen(rCandidate.getLength());
@@ -1528,13 +1528,13 @@ namespace svgio
{
const sal_Unicode aChar(rCandidate[nPos]);
- if(rPattern == aChar)
+ if(nPattern == aChar)
{
bChanged = true;
if(!bRemove)
{
- aBuffer.append(rNew);
+ aBuffer.append(nNew);
}
}
else
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 90a604c..51e3890 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -178,7 +178,7 @@ private:
bool mbShowHeader;
void DeleteEntries();
- void DoQuickSearch( const sal_Unicode& rChar );
+ void DoQuickSearch( sal_Unicode rChar );
bool Kill( const OUString& rURL );
protected:
@@ -860,7 +860,7 @@ bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
}
-void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar )
+void ViewTabListBox_Impl::DoQuickSearch( sal_Unicode rChar )
{
::osl::MutexGuard aGuard( maMutex );
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 30a3da7..6913002 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1425,7 +1425,7 @@ drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives(
const Point& rLPos, const Point& rRPos, const Style& rBorder,
const DiagStyle& /*rLFromTR*/, const Style& rLFromT, const Style& /*rLFromL*/, const Style& rLFromB, const DiagStyle& /*rLFromBR*/,
const DiagStyle& /*rRFromTL*/, const Style& rRFromT, const Style& /*rRFromR*/, const Style& rRFromB, const DiagStyle& /*rRFromBL*/,
- const Color* /*pForceColor*/, const long& nRotateT, const long& nRotateB )
+ const Color* /*pForceColor*/, long nRotateT, long nRotateB )
{
drawinglayer::primitive2d::Primitive2DContainer aSequence( 1 );
@@ -1453,7 +1453,7 @@ drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives(
const Point& rLPos, const Point& rRPos, const Style& rBorder,
const Style& rLFromT, const Style& rLFromL, const Style& rLFromB,
const Style& rRFromT, const Style& rRFromR, const Style& rRFromB,
- const Color* pForceColor, const long& nRotateT, const long& nRotateB )
+ const Color* pForceColor, long nRotateT, long nRotateB )
{
return CreateBorderPrimitives( rLPos, rRPos, rBorder,
DiagStyle(), rLFromT, rLFromL, rLFromB, DiagStyle(),
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index e4a220e..9386840 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -59,7 +59,7 @@ public:
@return bool, indicating, if given layer ID belongs to the visible ones.
*/
- virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const = 0;
+ virtual bool IsVisibleLayerId( SdrLayerID _nLayerId ) const = 0;
/** method to determine, if the corresponding invisible layer ID for a visible one.
@@ -74,7 +74,7 @@ public:
@return sal_Int8, invisible layer ID corresponding to given layer ID
*/
- virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) = 0;
+ virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( SdrLayerID _nVisibleLayerId ) = 0;
/// Searches text in shapes anchored inside rPaM.
virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) = 0;
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index e45ddf8..ae8face 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -281,7 +281,7 @@ void DocumentDrawModelManager::NotifyInvisibleLayers( SdrPageView& _rSdrPageView
_rSdrPageView.SetLayerVisible( sLayerNm, false );
}
-bool DocumentDrawModelManager::IsVisibleLayerId( const SdrLayerID& _nLayerId ) const
+bool DocumentDrawModelManager::IsVisibleLayerId( SdrLayerID _nLayerId ) const
{
bool bRetVal;
@@ -306,7 +306,7 @@ bool DocumentDrawModelManager::IsVisibleLayerId( const SdrLayerID& _nLayerId ) c
return bRetVal;
}
-SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId )
+SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( SdrLayerID _nVisibleLayerId )
{
SdrLayerID nInvisibleLayerId;
diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx
index 096d855..26a2557 100644
--- a/sw/source/core/inc/DocumentDrawModelManager.hxx
+++ b/sw/source/core/inc/DocumentDrawModelManager.hxx
@@ -55,9 +55,9 @@ public:
virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) override;
- virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const override;
+ virtual bool IsVisibleLayerId( SdrLayerID _nLayerId ) const override;
- virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) override;
+ virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( SdrLayerID _nVisibleLayerId ) override;
virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) override;
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index 9afd424..69e5384 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -229,7 +229,7 @@ ImplPrimitive2DIDBlock(AnchorPrimitive, PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE)
/*static*/ AnchorOverlayObject* AnchorOverlayObject::CreateAnchorOverlayObject(
SwView& rDocView,
const SwRect& aAnchorRect,
- const long& aPageBorder,
+ long aPageBorder,
const Point& aLineStart,
const Point& aLineEnd,
const Color& aColorAnchor )
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index ebe4923..579e4ee 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -43,7 +43,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
public:
static AnchorOverlayObject* CreateAnchorOverlayObject( SwView& rDocView,
const SwRect& aAnchorRect,
- const long& aPageBorder,
+ long aPageBorder,
const Point& aLineStart,
const Point& aLineEnd,
const Color& aColorAnchor );
diff --git a/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx
index b56d20c..cc0fc13 100644
--- a/tools/source/datetime/datetime.cxx
+++ b/tools/source/datetime/datetime.cxx
@@ -235,7 +235,7 @@ void DateTime::GetWin32FileDateTime( sal_uInt32 & rLower, sal_uInt32 & rUpper )
rUpper = sal_uInt32( aTime / SAL_CONST_UINT64( 0x100000000 ) );
}
-DateTime DateTime::CreateFromWin32FileDateTime( const sal_uInt32 & rLower, const sal_uInt32 & rUpper )
+DateTime DateTime::CreateFromWin32FileDateTime( sal_uInt32 rLower, sal_uInt32 rUpper )
{
const sal_Int64 a100nPerSecond = SAL_CONST_INT64( 10000000 );
const sal_Int64 a100nPerDay = a100nPerSecond * sal_Int64( 60 * 60 * 24 );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 8e18a07..6db4742 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -121,13 +121,13 @@ shell::MyProperty::MyProperty( const OUString& theProper
// empty
}
-shell::MyProperty::MyProperty( const bool& theisNative,
+shell::MyProperty::MyProperty( bool theisNative,
const OUString& thePropertyName,
- const sal_Int32& theHandle,
+ sal_Int32 theHandle,
const css::uno::Type& theTyp,
const css::uno::Any& theValue,
const css::beans::PropertyState& theState,
- const sal_Int16& theAttributes )
+ sal_Int16 theAttributes )
: PropertyName( thePropertyName ),
Handle( theHandle ),
isNative( theisNative ),
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 59f5696..cf45e64 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -89,13 +89,13 @@ namespace fileaccess {
public:
MyProperty();
explicit MyProperty( const OUString& thePropertyName );
- MyProperty( const bool& theIsNative,
+ MyProperty( bool theIsNative,
const OUString& thePropertyName,
- const sal_Int32& theHandle,
+ sal_Int32 theHandle,
const css::uno::Type& theTyp,
const css::uno::Any& theValue,
const css::beans::PropertyState& theState,
- const sal_Int16& theAttributes );
+ sal_Int16 theAttributes );
~MyProperty();
inline const bool& SAL_CALL IsNative() const;
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index f8d0846..6b9e7a3 100644
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star;
using namespace ucbhelper;
-SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity,
+SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( sal_Int32 lCertificateValidity,
const css::uno::Reference<css::security::XCertificate>& certificate,
const OUString & hostname)
{
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index b6c33b7..b4dca52 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -879,18 +879,18 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
return true;
}
-void SvpSalGraphics::applyColor(cairo_t *cr, const SalColor &rColor)
+void SvpSalGraphics::applyColor(cairo_t *cr, SalColor aColor)
{
if (CAIRO_FORMAT_ARGB32 == cairo_image_surface_get_format(m_pSurface))
{
- cairo_set_source_rgba(cr, SALCOLOR_RED(rColor)/255.0,
- SALCOLOR_GREEN(rColor)/255.0,
- SALCOLOR_BLUE(rColor)/255.0,
+ cairo_set_source_rgba(cr, SALCOLOR_RED(aColor)/255.0,
+ SALCOLOR_GREEN(aColor)/255.0,
+ SALCOLOR_BLUE(aColor)/255.0,
1.0);
}
else
{
- double fSet = rColor == COL_BLACK ? 0.0 : 1.0;
+ double fSet = aColor == COL_BLACK ? 0.0 : 1.0;
cairo_set_source_rgba(cr, 1, 1, 1, fSet);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
}
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 7580575..7be69f9 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -78,7 +78,7 @@ private:
void invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags);
void copySource(const SalTwoRect& rTR, cairo_surface_t* source);
void setupPolyPolygon(cairo_t* cr, const basegfx::B2DPolyPolygon& rPolyPoly);
- void applyColor(cairo_t *cr, const SalColor &rColor);
+ void applyColor(cairo_t *cr, SalColor rColor);
void drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly);
protected:
vcl::Region m_aClipRegion;
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 3cd6944..df2f68c 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -352,7 +352,7 @@ public:
bool GetEdgeBlending() const { return mbEdgeBlending; }
void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
- void EnableQuickSelection( const bool& b );
+ void EnableQuickSelection( bool b );
using Control::ImplInitSettings;
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 2d3424f..d81e5b5 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -609,7 +609,7 @@ struct ImplEntryMetrics
long nImgHeight;
};
-void ImplListBoxWindow::EnableQuickSelection( const bool& b )
+void ImplListBoxWindow::EnableQuickSelection( bool b )
{
maQuickSelectionEngine.SetEnabled( b );
}
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 1cbcc4d..f5d0dad 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-void ListBox::EnableQuickSelection( const bool& b )
+void ListBox::EnableQuickSelection( bool b )
{
mpImplLB->GetMainWindow()->EnableQuickSelection(b);
}
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index fc7e789..146b48e 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -104,7 +104,7 @@ namespace vcl
{
}
- void QuickSelectionEngine::SetEnabled( const bool& b )
+ void QuickSelectionEngine::SetEnabled( bool b )
{
bEnabled = b;
}
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 6accc01..921d5fd 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -252,7 +252,7 @@ void EMFWriter::ImplWritePlusEOF()
ImplEndCommentRecord();
}
-void EMFWriter::ImplWritePlusColor( const Color& rColor, const sal_uInt32& nTrans )
+void EMFWriter::ImplWritePlusColor( const Color& rColor, sal_uInt32 nTrans )
{
sal_uInt32 nAlpha = ((100-nTrans)*0xFF)/100;
sal_uInt32 nCol = rColor.GetBlue();
@@ -270,7 +270,7 @@ void EMFWriter::ImplWritePlusPoint( const Point& rPoint )
m_rStm.WriteUInt16( aPoint.X() ).WriteUInt16( aPoint.Y() );
}
-void EMFWriter::ImplWritePlusFillPolygonRecord( const tools::Polygon& rPoly, const sal_uInt32& nTrans )
+void EMFWriter::ImplWritePlusFillPolygonRecord( const tools::Polygon& rPoly, sal_uInt32 nTrans )
{
ImplBeginCommentRecord( WIN_EMR_COMMENT_EMFPLUS );
if( rPoly.GetSize() )
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index a7aa6fb..79491fc 100644
--- a/vcl/source/filter/wmf/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
@@ -83,8 +83,8 @@ private:
void ImplWrite( const GDIMetaFile& rMtf );
void WriteEMFPlusHeader( const Size &rMtfSizePix, const Size &rMtfSizeLog );
void ImplWritePlusEOF();
- void ImplWritePlusFillPolygonRecord( const tools::Polygon& rPoly, const sal_uInt32& nTrans );
- void ImplWritePlusColor( const Color& rColor, const sal_uInt32& nTrans );
+ void ImplWritePlusFillPolygonRecord( const tools::Polygon& rPoly, sal_uInt32 nTrans );
+ void ImplWritePlusColor( const Color& rColor, sal_uInt32 nTrans );
void ImplWritePlusPoint( const Point& rPoint );
public:
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 525e08a..6a3370f 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -138,7 +138,7 @@ public:
@param rNoteId id of the footnote to resolve
*/
virtual void resolveFootnote(Stream & rStream,
- const Id & rNoteType,
+ Id aNoteType,
const sal_Int32 nNoteId) = 0;
/**
Resolves an endnote to a stream handler.
@@ -151,7 +151,7 @@ public:
@param rNoteId id of the endnote to resolve
*/
virtual void resolveEndnote(Stream & rStream,
- const Id & rNoteType,
+ Id aNoteType,
const sal_Int32 NoteId) = 0;
/**
@@ -220,7 +220,7 @@ public:
virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) = 0;
virtual void setXNoteId(const sal_Int32 nId) = 0;
virtual sal_Int32 getXNoteId() const = 0;
- virtual void setXNoteType(const Id & nId) = 0;
+ virtual void setXNoteType(Id nId) = 0;
virtual const OUString & getTarget() const = 0;
virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) = 0;
virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) = 0;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 180a2b0..78b3907 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -250,7 +250,7 @@ sal_Int32 OOXMLDocumentImpl::getXNoteId() const
return mnXNoteId;
}
-void OOXMLDocumentImpl::setXNoteType(const Id & nId)
+void OOXMLDocumentImpl::setXNoteType(Id nId)
{
mXNoteType = nId;
}
@@ -276,7 +276,7 @@ OOXMLDocumentImpl::getSubStream(const OUString & rId)
}
writerfilter::Reference<Stream>::Pointer_t
-OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rType,
+OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, Id aType,
const sal_Int32 nId)
{
OOXMLStream::Pointer_t pStream =
@@ -284,7 +284,7 @@ OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rT
// See above, no status indicator for the note stream, either.
OOXMLDocumentImpl * pDocument = new OOXMLDocumentImpl(pStream, uno::Reference<task::XStatusIndicator>(), mbSkipImages, maMediaDescriptor);
pDocument->setXNoteId(nId);
- pDocument->setXNoteType(rType);
+ pDocument->setXNoteType(aType);
pDocument->setModel(getModel());
pDocument->setDrawPage(getDrawPage());
@@ -292,18 +292,18 @@ OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rT
}
void OOXMLDocumentImpl::resolveFootnote(Stream & rStream,
- const Id & rType,
+ Id aType,
const sal_Int32 nNoteId)
{
writerfilter::Reference<Stream>::Pointer_t pStream =
- getXNoteStream(OOXMLStream::FOOTNOTES, rType, nNoteId);
+ getXNoteStream(OOXMLStream::FOOTNOTES, aType, nNoteId);
Id nId;
- switch (rType)
+ switch (aType)
{
case NS_ooxml::LN_Value_doc_ST_FtnEdn_separator:
case NS_ooxml::LN_Value_doc_ST_FtnEdn_continuationSeparator:
- nId = rType;
+ nId = aType;
break;
default:
nId = NS_ooxml::LN_footnote;
@@ -314,18 +314,18 @@ void OOXMLDocumentImpl::resolveFootnote(Stream & rStream,
}
void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
- const Id & rType,
+ Id aType,
const sal_Int32 nNoteId)
{
writerfilter::Reference<Stream>::Pointer_t pStream =
- getXNoteStream(OOXMLStream::ENDNOTES, rType, nNoteId);
+ getXNoteStream(OOXMLStream::ENDNOTES, aType, nNoteId);
Id nId;
- switch (rType)
+ switch (aType)
{
case NS_ooxml::LN_Value_doc_ST_FtnEdn_separator:
case NS_ooxml::LN_Value_doc_ST_FtnEdn_continuationSeparator:
- nId = rType;
+ nId = aType;
break;
default:
nId = NS_ooxml::LN_endnote;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index e8da24d..3c29704 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -84,7 +84,7 @@ protected:
writerfilter::Reference<Stream>::Pointer_t
getXNoteStream(OOXMLStream::StreamType_t nType,
- const Id & rType,
+ Id aType,
const sal_Int32 nNoteId);
void setIsSubstream( bool bSubstream ) { mbIsSubstream = bSubstream; };
@@ -99,10 +99,10 @@ public:
virtual void resolve(Stream & rStream) override;
virtual void resolveFootnote(Stream & rStream,
- const Id & rType,
+ Id aType,
const sal_Int32 nNoteId) override;
virtual void resolveEndnote(Stream & rStream,
- const Id & rType,
+ Id aType,
const sal_Int32 nNoteId) override;
virtual void resolveHeader(Stream & rStream,
const sal_Int32 type,
@@ -126,7 +126,7 @@ public:
virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) override;
virtual void setXNoteId(const sal_Int32 nId) override;
virtual sal_Int32 getXNoteId() const override;
- virtual void setXNoteType(const Id & rId) override;
+ virtual void setXNoteType(Id aId) override;
virtual const OUString & getTarget() const override;
virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) override;
virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) override;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 7cc6e2c..30eb8a8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -475,7 +475,7 @@ void OOXMLFastContextHandler::setLastSectionGroup()
}
void OOXMLFastContextHandler::newProperty
-(const Id & /*nId*/, const OOXMLValue::Pointer_t& /*pVal*/)
+(Id /*nId*/, const OOXMLValue::Pointer_t& /*pVal*/)
{
}
@@ -649,12 +649,12 @@ void OOXMLFastContextHandler::propagateCharacterProperties()
mpParserState->setCharacterProperties(getPropertySet());
}
-void OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(const Id & rId)
+void OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(Id nId)
{
OOXMLValue::Pointer_t pValue(new OOXMLPropertySetValue(getPropertySet()));
OOXMLPropertySet::Pointer_t pPropertySet(new OOXMLPropertySet);
- OOXMLProperty::Pointer_t pProp(new OOXMLProperty(rId, pValue, OOXMLProperty::SPRM));
+ OOXMLProperty::Pointer_t pProp(new OOXMLProperty(nId, pValue, OOXMLProperty::SPRM));
pPropertySet->add(pProp);
mpParserState->setCharacterProperties(pPropertySet);
@@ -698,12 +698,12 @@ void OOXMLFastContextHandler::clearTableProps()
(new OOXMLPropertySet));
}
-void OOXMLFastContextHandler::sendPropertiesWithId(const Id & rId)
+void OOXMLFastContextHandler::sendPropertiesWithId(Id nId)
{
OOXMLValue::Pointer_t pValue(new OOXMLPropertySetValue(getPropertySet()));
OOXMLPropertySet::Pointer_t pPropertySet(new OOXMLPropertySet);
- OOXMLProperty::Pointer_t pProp(new OOXMLProperty(rId, pValue, OOXMLProperty::SPRM));
+ OOXMLProperty::Pointer_t pProp(new OOXMLProperty(nId, pValue, OOXMLProperty::SPRM));
pPropertySet->add(pProp);
mpStream->props(pPropertySet);
@@ -877,12 +877,12 @@ OOXMLFastContextHandlerStream::~OOXMLFastContextHandlerStream()
{
}
-void OOXMLFastContextHandlerStream::newProperty(const Id & rId,
+void OOXMLFastContextHandlerStream::newProperty(Id nId,
const OOXMLValue::Pointer_t& pVal)
{
- if (rId != 0x0)
+ if (nId != 0x0)
{
- OOXMLProperty::Pointer_t pProperty(new OOXMLProperty(rId, pVal, OOXMLProperty::ATTRIBUTE));
+ OOXMLProperty::Pointer_t pProperty(new OOXMLProperty(nId, pVal, OOXMLProperty::ATTRIBUTE));
mpPropertySetAttrs->add(pProperty);
}
@@ -952,11 +952,11 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerProperties::getValue() const
}
void OOXMLFastContextHandlerProperties::newProperty
-(const Id & rId, const OOXMLValue::Pointer_t& pVal)
+(Id nId, const OOXMLValue::Pointer_t& pVal)
{
- if (rId != 0x0)
+ if (nId != 0x0)
{
- OOXMLProperty::Pointer_t pProperty(new OOXMLProperty(rId, pVal, OOXMLProperty::ATTRIBUTE));
+ OOXMLProperty::Pointer_t pProperty(new OOXMLProperty(nId, pVal, OOXMLProperty::ATTRIBUTE));
mpPropertySet->add(pProperty);
}
@@ -1760,7 +1760,7 @@ OOXMLFastContextHandlerWrapper::getResource() const
return UNKNOWN;
}
-void OOXMLFastContextHandlerWrapper::addNamespace(const Id & nId)
+void OOXMLFastContextHandlerWrapper::addNamespace(Id nId)
{
mMyNamespaces.insert(nId);
}
@@ -1844,13 +1844,13 @@ OOXMLFastContextHandlerWrapper::getFastContextHandler() const
}
void OOXMLFastContextHandlerWrapper::newProperty
-(const Id & rId, const OOXMLValue::Pointer_t& pVal)
+(Id nId, const OOXMLValue::Pointer_t& pVal)
{
if (mxContext.is())
{
OOXMLFastContextHandler * pHandler = getFastContextHandler();
if (pHandler != nullptr)
- pHandler->newProperty(rId, pVal);
+ pHandler->newProperty(nId, pVal);
}
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index d50d46e..11f2ea9 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -99,7 +99,7 @@ public:
virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException);
- virtual void newProperty(const Id & rId, const OOXMLValue::Pointer_t& pVal);
+ virtual void newProperty(Id aId, const OOXMLValue::Pointer_t& pVal);
virtual void setPropertySet(const OOXMLPropertySet::Pointer_t& pPropertySet);
virtual OOXMLPropertySet::Pointer_t getPropertySet() const;
@@ -171,11 +171,11 @@ public:
void startTxbxContent();
void endTxbxContent();
void propagateCharacterProperties();
- void propagateCharacterPropertiesAsSet(const Id & rId);
+ void propagateCharacterPropertiesAsSet(Id nId);
void propagateTableProperties();
void propagateRowProperties();
void propagateCellProperties();
- void sendPropertiesWithId(const Id & rId);
+ void sendPropertiesWithId(Id nId);
void sendPropertiesToParent();
void sendCellProperties();
void sendRowProperties();
@@ -247,7 +247,7 @@ public:
const OOXMLPropertySet::Pointer_t& getPropertySetAttrs() const { return mpPropertySetAttrs;}
- virtual void newProperty(const Id & rId, const OOXMLValue::Pointer_t& pVal) override;
+ virtual void newProperty(Id aId, const OOXMLValue::Pointer_t& pVal) override;
void sendProperty(Id nId);
virtual OOXMLPropertySet::Pointer_t getPropertySet() const override;
@@ -266,7 +266,7 @@ public:
virtual OOXMLValue::Pointer_t getValue() const override;
virtual ResourceEnum_t getResource() const override { return PROPERTIES; }
- virtual void newProperty(const Id & nId, const OOXMLValue::Pointer_t& pVal) override;
+ virtual void newProperty(Id nId, const OOXMLValue::Pointer_t& pVal) override;
void handleXNotes();
void handleHdrFtr();
@@ -500,10 +500,10 @@ public:
virtual ResourceEnum_t getResource() const override;
- void addNamespace(const Id & nId);
+ void addNamespace(Id nId);
void addToken( Token_t Element );
- virtual void newProperty(const Id & rId, const OOXMLValue::Pointer_t& pVal) override;
+ virtual void newProperty(Id nId, const OOXMLValue::Pointer_t& pVal) override;
virtual void setPropertySet(const OOXMLPropertySet::Pointer_t& pPropertySet) override;
virtual OOXMLPropertySet::Pointer_t getPropertySet() const override;
More information about the Libreoffice-commits
mailing list