compilerplugins/clang/constparams.cxx | 103 +++++++++++++-----------
helpcompiler/inc/HelpLinker.hxx | 4
helpcompiler/source/HelpLinker.cxx | 2
include/vcl/GraphicNativeMetadata.hxx | 2
include/vcl/bitmap.hxx | 6 -
include/vcl/bitmapaccess.hxx | 2
include/vcl/bitmapex.hxx | 2
include/vcl/button.hxx | 2
include/vcl/dialog.hxx | 2
include/vcl/dockwin.hxx | 4
include/vcl/edit.hxx | 8 -
include/vcl/field.hxx | 8 -
include/vcl/filter/pdfdocument.hxx | 6 -
include/vcl/graphicfilter.hxx | 4
include/vcl/help.hxx | 2
include/vcl/layout.hxx | 4
include/vcl/lazydelete.hxx | 2
include/vcl/longcurr.hxx | 2
include/vcl/menu.hxx | 6 -
include/vcl/outdev.hxx | 10 +-
include/vcl/print.hxx | 4
include/vcl/svapp.hxx | 8 -
include/vcl/syswin.hxx | 2
include/vcl/texteng.hxx | 2
include/vcl/textview.hxx | 4
include/vcl/toolbox.hxx | 4
include/vcl/uitest/logger.hxx | 4
include/vcl/window.hxx | 18 ++--
include/vcl/wmf.hxx | 2
vcl/backendtest/VisualBackendTest.cxx | 8 -
vcl/backendtest/outputdevice/pixel.cxx | 2
vcl/inc/BitmapProcessor.hxx | 2
vcl/inc/BitmapSymmetryCheck.hxx | 2
vcl/inc/accmgr.hxx | 2
vcl/inc/bmpfast.hxx | 2
vcl/inc/brdwin.hxx | 4
vcl/inc/displayconnectiondispatch.hxx | 2
vcl/inc/impfontcache.hxx | 6 -
vcl/inc/implimagetree.hxx | 2
vcl/inc/opengl/FixedTextureAtlas.hxx | 2
vcl/inc/opengl/PackedTextureAtlas.hxx | 2
vcl/inc/opengl/RenderList.hxx | 2
vcl/inc/opengl/program.hxx | 4
vcl/inc/opengl/texture.hxx | 4
vcl/inc/opengl/x11/gdiimpl.hxx | 2
vcl/inc/openglgdiimpl.hxx | 4
vcl/inc/salgdi.hxx | 2
vcl/inc/salinst.hxx | 2
vcl/inc/sallayout.hxx | 2
vcl/inc/sft.hxx | 2
vcl/inc/svmconverter.hxx | 4
vcl/inc/unx/gendisp.hxx | 2
vcl/inc/unx/geninst.h | 2
vcl/inc/unx/glyphcache.hxx | 4
vcl/inc/unx/gtk/gtkdata.hxx | 4
vcl/inc/unx/gtk/gtkframe.hxx | 8 -
vcl/inc/unx/gtk/gtksalmenu.hxx | 4
vcl/inc/unx/i18n_ic.hxx | 4
vcl/inc/unx/printergfx.hxx | 2
vcl/inc/unx/salbmp.h | 4
vcl/inc/unx/salframe.h | 2
vcl/inc/unx/wmadaptor.hxx | 8 -
vcl/opengl/FixedTextureAtlas.cxx | 2
vcl/opengl/PackedTextureAtlas.cxx | 2
vcl/opengl/RenderList.cxx | 2
vcl/opengl/gdiimpl.cxx | 4
vcl/opengl/program.cxx | 4
vcl/opengl/salbmp.cxx | 2
vcl/opengl/texture.cxx | 4
vcl/opengl/x11/gdiimpl.cxx | 2
vcl/source/app/help.cxx | 2
vcl/source/app/salvtables.cxx | 2
vcl/source/app/svapp.cxx | 8 -
vcl/source/bitmap/BitmapProcessor.cxx | 2
vcl/source/bitmap/BitmapSymmetryCheck.cxx | 2
vcl/source/bitmap/bitmapscalesuper.cxx | 2
vcl/source/control/button.cxx | 6 -
vcl/source/control/edit.cxx | 8 -
vcl/source/control/field.cxx | 4
vcl/source/control/field2.cxx | 4
vcl/source/control/longcurr.cxx | 2
vcl/source/control/prgsbar.cxx | 2
vcl/source/control/quickselectionengine.cxx | 2
vcl/source/control/spinfld.cxx | 2
vcl/source/edit/texteng.cxx | 2
vcl/source/edit/textview.cxx | 4
vcl/source/filter/FilterConfigItem.cxx | 2
vcl/source/filter/GraphicNativeMetadata.cxx | 2
vcl/source/filter/graphicfilter.cxx | 4
vcl/source/filter/ipdf/pdfdocument.cxx | 6 -
vcl/source/filter/sgvmain.cxx | 2
vcl/source/filter/sgvspln.cxx | 4
vcl/source/filter/sgvspln.hxx | 4
vcl/source/filter/sgvtext.cxx | 6 -
vcl/source/filter/wmf/wmf.cxx | 2
vcl/source/filter/wmf/wmfwr.cxx | 2
vcl/source/filter/wmf/wmfwr.hxx | 2
vcl/source/font/fontcache.cxx | 6 -
vcl/source/fontsubset/sft.cxx | 6 -
vcl/source/fontsubset/ttcr.cxx | 4
vcl/source/fontsubset/ttcr.hxx | 2
vcl/source/gdi/bitmap3.cxx | 6 -
vcl/source/gdi/bitmapex.cxx | 2
vcl/source/gdi/bmpacc.cxx | 2
vcl/source/gdi/bmpfast.cxx | 2
vcl/source/gdi/dibtools.cxx | 12 +-
vcl/source/gdi/impvect.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 10 +-
vcl/source/gdi/pdfwriter_impl.hxx | 10 +-
vcl/source/gdi/pdfwriter_impl2.cxx | 4
vcl/source/gdi/pngwrite.cxx | 4
vcl/source/gdi/print2.cxx | 2
vcl/source/gdi/print3.cxx | 6 -
vcl/source/gdi/salgdilayout.cxx | 2
vcl/source/gdi/sallayout.cxx | 2
vcl/source/gdi/svmconverter.cxx | 4
vcl/source/helper/displayconnectiondispatch.cxx | 4
vcl/source/helper/lazydelete.cxx | 2
vcl/source/image/ImplImageTree.cxx | 4
vcl/source/outdev/bitmap.cxx | 16 +--
vcl/source/outdev/textline.cxx | 2
vcl/source/uitest/logger.cxx | 6 -
vcl/source/uitest/uiobject.cxx | 6 -
vcl/source/window/accmgr.cxx | 2
vcl/source/window/brdwin.cxx | 4
vcl/source/window/builder.cxx | 2
vcl/source/window/dialog.cxx | 12 +-
vcl/source/window/dlgctrl.cxx | 2
vcl/source/window/dockingarea.cxx | 2
vcl/source/window/dockmgr.cxx | 4
vcl/source/window/event.cxx | 2
vcl/source/window/layout.cxx | 4
vcl/source/window/menu.cxx | 10 +-
vcl/source/window/menubarwindow.cxx | 4
vcl/source/window/menubarwindow.hxx | 2
vcl/source/window/menuwindow.cxx | 2
vcl/source/window/menuwindow.hxx | 2
vcl/source/window/mnemonicengine.cxx | 2
vcl/source/window/paint.cxx | 6 -
vcl/source/window/syswin.cxx | 2
vcl/source/window/toolbox.cxx | 6 -
vcl/source/window/window.cxx | 8 -
vcl/source/window/window2.cxx | 6 -
vcl/source/window/winproc.cxx | 16 +--
vcl/unx/generic/app/gendisp.cxx | 2
vcl/unx/generic/app/i18n_cb.cxx | 2
vcl/unx/generic/app/i18n_ic.cxx | 4
vcl/unx/generic/app/wmadaptor.cxx | 8 -
vcl/unx/generic/dtrans/X11_selection.cxx | 2
vcl/unx/generic/dtrans/X11_selection.hxx | 2
vcl/unx/generic/fontmanager/fontconfig.cxx | 4
vcl/unx/generic/gdi/salbmp.cxx | 6 -
vcl/unx/generic/gdi/xrender_peer.hxx | 4
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2
vcl/unx/generic/glyphs/glyphcache.cxx | 2
vcl/unx/generic/print/genprnpsp.cxx | 6 -
vcl/unx/generic/print/genpspgraphics.cxx | 8 -
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/window/salframe.cxx | 6 -
vcl/unx/gtk/a11y/atkutil.cxx | 2
vcl/unx/gtk/a11y/atkwindow.cxx | 2
vcl/unx/gtk/gtkdata.cxx | 6 -
vcl/unx/gtk/gtksalmenu.cxx | 4
vcl/unx/gtk/salnativewidgets-gtk.cxx | 4
vcl/unx/gtk3/gtk3gtkdata.cxx | 6 -
vcl/unx/gtk3/gtk3gtkframe.cxx | 2
vcl/workben/vcldemo.cxx | 2
167 files changed, 388 insertions(+), 379 deletions(-)
New commits:
commit 72f36adb93d24a3da8868dad128ab2eca0124fda
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Jul 18 09:02:03 2017 +0200
loplugin:constparams in vcl
Change-Id: I36afe2107e07ffb9b73c0b76be600e3e999a0fd4
Reviewed-on: https://gerrit.libreoffice.org/40116
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/constparams.cxx
b/compilerplugins/clang/constparams.cxx
index 95325c57d1a7..024ee4ffd53e 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -36,8 +36,9 @@ public:
bool VisitFunctionDecl(FunctionDecl *);
bool VisitDeclRefExpr( const DeclRefExpr* );
+
private:
- bool checkIfCanBeConst(const Stmt*);
+ bool checkIfCanBeConst(const Stmt*, const ParmVarDecl*);
bool isPointerOrReferenceToConst(const QualType& qt);
StringRef getFilename(const SourceLocation& loc);
@@ -85,11 +86,29 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl *
functionDecl)
StringRef name = functionDecl->getName();
if (name == "yyerror" // ignore lex/yacc callback
// some function callbacks
+ // TODO should really use a two-pass algorithm to detect and
ignore these automatically
|| name == "PDFSigningPKCS7PasswordCallback"
|| name == "VCLExceptionSignal_impl"
|| name == "parseXcsFile"
+ || name == "GraphicsExposePredicate"
+ || name == "ImplPredicateEvent"
+ || name == "timestamp_predicate"
+ || name == "signalScreenSizeChanged"
+ || name == "signalMonitorsChanged"
+ || name == "signalButton"
+ || name == "signalFocus"
+ || name == "signalDestroy"
+ || name == "signalSettingsNotify"
+ || name == "signalStyleSet"
+ || name == "signalIMCommit"
+ || name == "compressWheelEvents"
+ || name == "MenuBarSignalKey"
+ || name == "signalDragDropReceived"
// UNO component entry points
- || name.endswith("component_getFactory"))
+ || name.endswith("component_getFactory")
+ // in Scheduler::, wants to loop until a reference to a bool
becomes true
+ || name == "ProcessEventsToSignal"
+ )
return true;
}
@@ -120,7 +139,7 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl *
functionDecl)
continue;
if (type.LvalueReference().Const())
continue;
- // since we can't normally change typedefs, just ignore them
+ // since we normally can't change typedefs, just ignore them
if (isa<TypedefType>(pParmVarDecl->getType()))
continue;
// TODO ignore these for now, has some effects I don't understand
@@ -156,7 +175,6 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl *
functionDecl)
pOther->getLocStart())
<< pOther->getSourceRange();
}
- //functionDecl->dump();
}
}
return ret;
@@ -174,13 +192,15 @@ bool ConstParams::VisitDeclRefExpr( const DeclRefExpr*
declRefExpr )
if (interestingSet.find(parmVarDecl) == interestingSet.end()) {
return true;
}
- if (!checkIfCanBeConst(declRefExpr))
+ if (!checkIfCanBeConst(declRefExpr, parmVarDecl))
cannotBeConstSet.insert(parmVarDecl);
return true;
}
-bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
+// Walk up from a DeclRefExpr to a ParamVarDecl, checking if the usage means
that the
+// ParamVarDecl can be const.
+bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl*
parmVarDecl)
{
const Stmt* parent = parentStmt( stmt );
if (isa<UnaryOperator>(parent)) {
@@ -191,7 +211,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
return false;
}
if (op == UO_Deref) {
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
}
return true;
} else if (auto binaryOp = dyn_cast<BinaryOperator>(parent)) {
@@ -211,7 +231,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
}
// for pointer arithmetic need to check parent
if (binaryOp->getType()->isPointerType()) {
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
}
return true;
} else if (isa<CXXConstructExpr>(parent)) {
@@ -222,8 +242,6 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
return
isPointerOrReferenceToConst(constructorDecl->getParamDecl(i)->getType());
}
}
- std::cout << "dump0" << std::endl;
- parent->dump();
} else if (isa<CXXOperatorCallExpr>(parent)) {
const CXXOperatorCallExpr* operatorCallExpr =
dyn_cast<CXXOperatorCallExpr>(parent);
const CXXMethodDecl* calleeMethodDecl =
dyn_cast<CXXMethodDecl>(operatorCallExpr->getDirectCallee());
@@ -254,9 +272,6 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
}
}
}
- std::cout << "dump1" << std::endl;
- parent->dump();
- stmt->dump();
} else if (isa<CallExpr>(parent)) {
const CallExpr* callExpr = dyn_cast<CallExpr>(parent);
QualType functionType = callExpr->getCallee()->getType();
@@ -287,20 +302,6 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
return calleeMethodDecl->isConst();
}
}
- if (!calleeFunctionDecl) {
- std::cout << "---------------dump2" << std::endl;
- std::cout << "parent" << std::endl;
- parent->dump();
- std::cout << "child" << std::endl;
- stmt->dump();
- std::cout << "callee-type" << std::endl;
- callExpr->getCallee()->getType()->dump();
- for (unsigned i = 0; i < callExpr->getNumArgs(); ++i) {
- std::cout << " param " << i << std::endl;
- callExpr->getArg(i)->dump();
- }
- return true;
- }
// TODO could do better
if (calleeFunctionDecl->isVariadic()) {
return false;
@@ -315,32 +316,18 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
return
isPointerOrReferenceToConst(calleeFunctionDecl->getParamDecl(i)->getType());
}
}
- std::cout << "------------dump3" << std::endl;
- std::cout << "parent" << std::endl;
- parent->dump();
- std::cout << "child" << std::endl;
- stmt->dump();
- calleeFunctionDecl->dump();
- for (unsigned i = 0; i < callExpr->getNumArgs(); ++i) {
- std::cout << " param " << i << std::endl;
- callExpr->getArg(i)->dump();
- }
- if (isa<CXXMemberCallExpr>(parent)) {
- std::cout << "implicit" << std::endl;
-
dyn_cast<CXXMemberCallExpr>(parent)->getImplicitObjectArgument()->dump();
- }
} else if (isa<CXXReinterpretCastExpr>(parent)) {
return false;
} else if (isa<CXXConstCastExpr>(parent)) {
return false;
} else if (isa<CastExpr>(parent)) { // all other cast expression subtypes
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
} else if (isa<MemberExpr>(parent)) {
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
} else if (isa<ArraySubscriptExpr>(parent)) {
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
} else if (isa<ParenExpr>(parent)) {
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
} else if (isa<DeclStmt>(parent)) {
// TODO could do better here, but would require tracking the target(s)
return false;
@@ -367,10 +354,32 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt)
} else if (const ConditionalOperator* conditionalExpr =
dyn_cast<ConditionalOperator>(parent)) {
if (conditionalExpr->getCond() == stmt)
return true;
- return checkIfCanBeConst(parent);
+ return checkIfCanBeConst(parent, parmVarDecl);
+ } else if (isa<UnaryExprOrTypeTraitExpr>(parent)) {
+ return false; // ???
+ } else if (isa<CXXNewExpr>(parent)) {
+ return true; // because the ParamVarDecl must be a parameter to the
expression, probably an array count
+ } else if (auto lambdaExpr = dyn_cast<LambdaExpr>(parent)) {
+ for (auto it = lambdaExpr->capture_begin(); it !=
lambdaExpr->capture_end(); ++it)
+ {
+ if (it->getCapturedVar() == parmVarDecl)
+ return it->getCaptureKind() != LCK_ByRef;
+ }
+ report(
+ DiagnosticsEngine::Warning,
+ "cannot handle this lambda",
+ parent->getLocStart())
+ << parent->getSourceRange();
+ parent->dump();
+ parmVarDecl->dump();
} else {
- std::cout << "dump5" << std::endl;
+ report(
+ DiagnosticsEngine::Warning,
+ "oh dear, what can the matter be?",
+ parent->getLocStart())
+ << parent->getSourceRange();
parent->dump();
+ parmVarDecl->dump();
}
return true;
}
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 3fdbbe015230..9002445e3784 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -50,8 +50,8 @@ class L10N_DLLPUBLIC HelpLinker
public:
/// @throws HelpProcessingException
void main(std::vector<std::string> &args,
- std::string* pExtensionPath = nullptr,
- std::string* pDestination = nullptr,
+ std::string const * pExtensionPath = nullptr,
+ std::string const * pDestination = nullptr,
const OUString* pOfficeHelpPath = nullptr );
HelpLinker()
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index c2f77ec9374a..b45dceae3f5c 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -532,7 +532,7 @@ void HelpLinker::link()
void HelpLinker::main( std::vector<std::string> &args,
- std::string* pExtensionPath, std::string* pDestination,
+ std::string const * pExtensionPath, std::string const *
pDestination,
const OUString* pOfficeHelpPath )
{
bExtensionMode = false;
diff --git a/include/vcl/GraphicNativeMetadata.hxx
b/include/vcl/GraphicNativeMetadata.hxx
index 7f249bcc4913..4ae29276205a 100644
--- a/include/vcl/GraphicNativeMetadata.hxx
+++ b/include/vcl/GraphicNativeMetadata.hxx
@@ -30,7 +30,7 @@ public:
GraphicNativeMetadata();
~GraphicNativeMetadata();
- bool read(Graphic& rGraphic);
+ bool read(Graphic const & rGraphic);
sal_uInt16 getRotation() { return mRotation;}
};
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 80b58ca509cc..115f47664aa7 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -664,7 +664,7 @@ public:
SAL_DLLPRIVATE bool ImplConvolutionPass(
Bitmap& aNewBitmap,
- BitmapReadAccess* pReadAcc,
+ BitmapReadAccess const * pReadAcc,
int aNumberOfContributions,
const double* pWeights,
int* pPixels,
@@ -672,8 +672,8 @@ public:
SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold );
SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales );
- SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color*
pExtColor = nullptr );
- SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color*
pExtColor = nullptr );
+ SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color const *
pExtColor = nullptr );
+ SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color const
* pExtColor = nullptr );
SAL_DLLPRIVATE bool ImplConvertGhosted();
SAL_DLLPRIVATE bool ImplDitherMatrix();
SAL_DLLPRIVATE bool ImplDitherFloyd();
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index d61d172e2166..b7995f46943e 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -238,7 +238,7 @@ protected:
FncGetPixel mFncGetPixel;
FncSetPixel mFncSetPixel;
- SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap& rBitmap );
+ SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap const & rBitmap );
SAL_DLLPRIVATE bool ImplSetAccessPointers( ScanlineFormat nFormat );
public:
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 58395fe7d0e4..705109e2203a 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -419,7 +419,7 @@ public:
*/
BitmapEx ModifyBitmapEx( const basegfx::BColorModifierStack&
rBColorModifierStack) const;
- static BitmapEx AutoScaleBitmap( BitmapEx & aBitmap, const long
aStandardSize );
+ static BitmapEx AutoScaleBitmap( BitmapEx const & aBitmap, const long
aStandardSize );
/// populate from a canvas implementation
bool Create(
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index c1e433edae14..b469060661bf 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -119,7 +119,7 @@ class VCL_DLLPUBLIC PushButton : public Button
public:
SAL_DLLPRIVATE void ImplSetDefButton( bool bSet );
SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext&
rRenderContext, tools::Rectangle& rRect, DrawButtonFlags nStyle);
- SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window* pDev,
const Point& rPos);
+ SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window const *
pDev, const Point& rPos);
SAL_DLLPRIVATE bool ImplIsDefButton() const;
explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 8c63e57c7415..49737fdc6057 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -129,7 +129,7 @@ public:
void EndDialog( long nResult = 0 );
- static void EndAllDialogs( vcl::Window* pParent );
+ static void EndAllDialogs( vcl::Window const * pParent );
void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32&
rTopBorder,
sal_Int32& rRightBorder, sal_Int32&
rBottomBorder ) const;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index a3e60b7f433f..98cded028533 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -119,7 +119,7 @@ public:
bool ImplStartDocking( const Point& rPos );
// those methods actually call the corresponding handlers
- void StartDocking( const Point& rPos, tools::Rectangle& rRect );
+ void StartDocking( const Point& rPos, tools::Rectangle const &
rRect );
bool Docking( const Point& rPos, tools::Rectangle& rRect );
void EndDocking( const tools::Rectangle& rRect, bool bFloatMode
);
bool PrepareToggleFloatingMode();
@@ -191,7 +191,7 @@ public:
// required because those methods are not virtual in Window (!!!) and must
// be availbale from the toolkit
- void SetPosSizePixel( vcl::Window *pWin, long nX, long nY,
+ void SetPosSizePixel( vcl::Window const *pWin, long nX, long nY,
long nWidth, long nHeight,
PosSizeFlags nFlags );
tools::Rectangle GetPosSizePixel( const vcl::Window *pWin );
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index caf94fbee1fe..632e9b751ee7 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -110,7 +110,7 @@ private:
SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const
Selection* pNewSelection = nullptr, bool bIsUserInput = false );
SAL_DLLPRIVATE static OUString ImplGetValidString( const OUString& rString
);
SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext&
rRenderContext, const tools::Rectangle& rRectangle, long nXStart, long nXEnd);
- SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext&
rRenderContext, long nXStart, long nXEnd);
+ SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext const &
rRenderContext, long nXStart, long nXEnd);
SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true );
SAL_DLLPRIVATE void ImplAlign();
SAL_DLLPRIVATE void ImplAlignAndPaint();
@@ -120,8 +120,8 @@ private:
SAL_DLLPRIVATE void ImplHideDDCursor();
SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvt );
SAL_DLLPRIVATE void ImplCopyToSelectionClipboard();
- SAL_DLLPRIVATE void
ImplCopy(css::uno::Reference<css::datatransfer::clipboard::XClipboard>&
rxClipboard);
- SAL_DLLPRIVATE void
ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard>&
rxClipboard);
+ SAL_DLLPRIVATE void
ImplCopy(css::uno::Reference<css::datatransfer::clipboard::XClipboard> const &
rxClipboard);
+ SAL_DLLPRIVATE void
ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard> const &
rxClipboard);
SAL_DLLPRIVATE long ImplGetTextYPosition() const;
SAL_DLLPRIVATE
css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > const &
ImplGetInputSequenceChecker();
SAL_DLLPRIVATE static css::uno::Reference<css::i18n::XBreakIterator >
ImplGetBreakIterator();
@@ -157,7 +157,7 @@ protected:
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
public:
// public because needed in button.cxx
- SAL_DLLPRIVATE bool ImplUseNativeBorder(vcl::RenderContext&
rRenderContext, WinBits nStyle);
+ SAL_DLLPRIVATE bool ImplUseNativeBorder(vcl::RenderContext const &
rRenderContext, WinBits nStyle);
Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER );
virtual ~Edit() override;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 9a0b32d435fd..3fb0633fe3a6 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -49,7 +49,7 @@ private:
bool mbDefaultLocale;
protected:
- SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection*
pNewSel = nullptr );
+ SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection
const * pNewSel = nullptr );
SAL_DLLPRIVATE bool ImplGetEmptyFieldValue() const { return
mbEmptyFieldValue; }
void SetEmptyFieldValueData( bool bValue ) {
mbEmptyFieldValue = bValue; }
@@ -182,7 +182,7 @@ protected:
SAL_DLLPRIVATE bool ImplNumericReformat( const OUString& rStr,
sal_Int64& rValue, OUString& rOutStr );
SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue );
- SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection*
pNewSelection = nullptr );
+ SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection
const * pNewSelection = nullptr );
private:
SAL_DLLPRIVATE void ImplInit();
@@ -286,7 +286,7 @@ protected:
SAL_DLLPRIVATE const Date& ImplGetFieldDate() const { return
maFieldDate; }
SAL_DLLPRIVATE bool ImplDateReformat( const OUString& rStr, OUString&
rOutStr );
SAL_DLLPRIVATE void ImplSetUserDate( const Date& rNewDate,
- Selection* pNewSelection =
nullptr );
+ Selection const * pNewSelection =
nullptr );
SAL_DLLPRIVATE OUString ImplGetDateAsText( const Date& rDate ) const;
SAL_DLLPRIVATE void ImplNewFieldValue( const Date& rDate );
CalendarWrapper& GetCalendarWrapper() const;
@@ -374,7 +374,7 @@ protected:
SAL_DLLPRIVATE bool ImplTimeReformat( const OUString& rStr, OUString&
rOutStr );
SAL_DLLPRIVATE void ImplNewFieldValue( const tools::Time& rTime );
- SAL_DLLPRIVATE void ImplSetUserTime( const tools::Time& rNewTime,
Selection* pNewSelection = nullptr );
+ SAL_DLLPRIVATE void ImplSetUserTime( const tools::Time& rNewTime,
Selection const * pNewSelection = nullptr );
SAL_DLLPRIVATE bool ImplAllowMalformedInput() const;
public:
diff --git a/include/vcl/filter/pdfdocument.hxx
b/include/vcl/filter/pdfdocument.hxx
index 09288326e921..16c4edc81f30 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -322,13 +322,13 @@ class VCL_DLLPUBLIC PDFDocument
/// Write the appearance object as part of signing.
sal_Int32 WriteAppearanceObject();
/// Write the annot object as part of signing.
- sal_Int32 WriteAnnotObject(PDFObjectElement& rFirstPage, sal_Int32
nSignatureId, sal_Int32 nAppearanceId);
+ sal_Int32 WriteAnnotObject(PDFObjectElement const & rFirstPage, sal_Int32
nSignatureId, sal_Int32 nAppearanceId);
/// Write the updated Page object as part of signing.
bool WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnotId);
/// Write the updated Catalog object as part of signing.
bool WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& pRoot);
/// Write the updated cross-references as part of signing.
- void WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement* pRoot);
+ void WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const * pRoot);
public:
PDFDocument();
@@ -337,7 +337,7 @@ public:
/// @name Low-level functions, to be used by PDFElement subclasses.
//@{
/// Decode a hex dump.
- static std::vector<unsigned char> DecodeHexString(PDFHexStringElement*
pElement);
+ static std::vector<unsigned char> DecodeHexString(PDFHexStringElement
const * pElement);
static OString ReadKeyword(SvStream& rStream);
static size_t FindStartXRef(SvStream& rStream);
void ReadXRef(SvStream& rStream);
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index deed307298cf..e41583f899f8 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -279,7 +279,7 @@ public:
SvStream& rStream,
sal_uInt16 nFormat =
GRFILTER_FORMAT_DONTKNOW,
sal_uInt16 * pDeterminedFormat = nullptr,
GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE,
- WmfExternal *pExtHeader = nullptr );
+ WmfExternal const *pExtHeader = nullptr );
/// Imports multiple graphics.
///
@@ -291,7 +291,7 @@ public:
sal_uInt16 nFormat,
sal_uInt16 * pDeterminedFormat,
GraphicFilterImportFlags nImportFlags,
css::uno::Sequence<
css::beans::PropertyValue >* pFilterData,
- WmfExternal *pExtHeader = nullptr );
+ WmfExternal const *pExtHeader = nullptr );
const FilterErrorEx& GetLastError() const { return *pErrorEx;}
void ResetLastError();
diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index cd64b4f669db..cb1c297e9379 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -108,7 +108,7 @@ public:
vcl::Window* pParent,
const tools::Rectangle& rScreenRect,
const OUString& rText);
- static void HidePopover(vcl::Window* pParent, sal_uLong nId);
+ static void HidePopover(vcl::Window const * pParent, sal_uLong
nId);
};
#endif // INCLUDED_VCL_HELP_HXX
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 8e9b0e02e381..e9475b3d4630 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -644,7 +644,7 @@ private:
OUString m_sPrimaryString;
OUString m_sSecondaryString;
DECL_DLLPRIVATE_LINK(ButtonHdl, Button *, void);
- void setButtonHandlers(VclButtonBox *pButtonBox);
+ void setButtonHandlers(VclButtonBox const *pButtonBox);
short get_response(const vcl::Window *pWindow) const;
void create_owned_areas();
@@ -668,7 +668,7 @@ public:
virtual ~MessageDialog() override;
virtual void dispose() override;
- static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit
*pPrimaryMessage,
+ static void SetMessagesWidths(vcl::Window const *pParent, VclMultiLineEdit
*pPrimaryMessage,
VclMultiLineEdit *pSecondaryMessage);
};
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 63196185701a..4bc122457279 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -115,7 +115,7 @@ namespace vcl
/** strict weak ordering function to bring objects to be destroyed
lazily
in correct order, e.g. for Window objects children before parents
*/
- static bool is_less( vcl::Window* left, vcl::Window* right );
+ static bool is_less( vcl::Window const * left, vcl::Window const *
right );
LazyDeletor() { LazyDelete::addDeletor( this ); }
virtual ~LazyDeletor() override
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index 9bcbe3085e40..b7687ae32ce9 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -59,7 +59,7 @@ protected:
LongCurrencyFormatter();
private:
- friend bool ImplLongCurrencyReformat( const OUString&, BigInt const &,
BigInt const &, sal_uInt16, const LocaleDataWrapper&, OUString&,
LongCurrencyFormatter& );
+ friend bool ImplLongCurrencyReformat( const OUString&, BigInt const &,
BigInt const &, sal_uInt16, const LocaleDataWrapper&, OUString&,
LongCurrencyFormatter const & );
SAL_DLLPRIVATE void ImpInit();
BigInt mnFieldValue;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index ddf12f629c99..10c708f830b5 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -179,7 +179,7 @@ protected:
SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext,
- sal_uInt16 nBorder, long nOffY = 0,
MenuItemData* pThisDataOnly = nullptr,
+ sal_uInt16 nBorder, long nOffY = 0,
MenuItemData const * pThisDataOnly = nullptr,
bool bHighlighted = false, bool bLayout =
false, bool bRollover = false ) const;
SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const
tools::Rectangle& rRect) const;
SAL_DLLPRIVATE void ImplSelect();
@@ -194,11 +194,11 @@ protected:
// returns native check and option menu symbol height in rCheckHeight and
rRadioHeight
// return value is maximum width and height of checkboxes and radiobuttons
- SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize(vcl::RenderContext&
rRenderContext, long& rCheckHeight, long& rRadioHeight) const;
+ SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize(vcl::RenderContext
const & rRenderContext, long& rCheckHeight, long& rRadioHeight) const;
// returns native submenu arrow size and spacing from right border
// return value is whether it's supported natively
- SAL_DLLPRIVATE static bool
ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Size&
rArrowSize, long& rArrowSpacing);
+ SAL_DLLPRIVATE static bool
ImplGetNativeSubmenuArrowSize(vcl::RenderContext const & rRenderContext, Size&
rArrowSize, long& rArrowSpacing);
SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel );
SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel );
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8f02b1928887..2bb258f95213 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1179,7 +1179,7 @@ private:
SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& );
SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY,
long nX, long nY, long nWidth, long nHeight );
- SAL_DLLPRIVATE static void ImplDrawWavePixel( long nOriginX, long
nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics,
OutputDevice* pOutDev,
+ SAL_DLLPRIVATE static void ImplDrawWavePixel( long nOriginX, long
nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics,
OutputDevice const * pOutDev,
bool bDrawPixAsRect, long
nPixWidth, long nPixHeight );
SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY,
long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short
nOrientation, const Color& rColor );
SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long
nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor,
bool bIsAbove );
@@ -1516,8 +1516,8 @@ private:
SAL_DLLPRIVATE Bitmap BlendBitmap(
Bitmap& aBmp,
- BitmapReadAccess* pP,
- BitmapReadAccess* pA,
+ BitmapReadAccess const * pP,
+ BitmapReadAccess const * pA,
const sal_Int32 nOffY,
const sal_Int32 nDstHeight,
const sal_Int32 nOffX,
@@ -1531,8 +1531,8 @@ private:
SAL_DLLPRIVATE Bitmap BlendBitmapWithAlpha(
Bitmap& aBmp,
- BitmapReadAccess* pP,
- BitmapReadAccess* pA,
+ BitmapReadAccess const * pP,
+ BitmapReadAccess const * pA,
const tools::Rectangle& aDstRect,
const sal_Int32 nOffY,
const sal_Int32 nDstHeight,
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 4de18652f0a8..94e5b9dd6ba0 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -213,7 +213,7 @@ private:
SAL_DLLPRIVATE void ImplUpdateFontList();
SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&,
bool bMatchNearest );
- SAL_DLLPRIVATE bool StartJob( const OUString& rJobName,
std::shared_ptr<vcl::PrinterController>& );
+ SAL_DLLPRIVATE bool StartJob( const OUString& rJobName,
std::shared_ptr<vcl::PrinterController> const & );
static SAL_DLLPRIVATE ErrCode
ImplSalPrinterErrorCodeToVCL( sal_uLong nError
);
@@ -559,7 +559,7 @@ public:
SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue >
getPageParametersProtected( int
i_nPage ) const;
- SAL_DLLPRIVATE DrawModeFlags removeTransparencies( GDIMetaFile&
i_rIn, GDIMetaFile& o_rOut );
+ SAL_DLLPRIVATE DrawModeFlags removeTransparencies( GDIMetaFile
const & i_rIn, GDIMetaFile& o_rOut );
SAL_DLLPRIVATE void resetPrinterOptions( bool
i_bFileOutput );
};
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c108d4b6d992..eddce0abf324 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -758,7 +758,7 @@ public:
@see HandleKey
*/
- static ImplSVEvent * PostKeyEvent( VclEventId nEvent, vcl::Window
*pWin, KeyEvent* pKeyEvent );
+ static ImplSVEvent * PostKeyEvent( VclEventId nEvent, vcl::Window
*pWin, KeyEvent const * pKeyEvent );
/** Send mouse event
@@ -766,7 +766,7 @@ public:
@param pWin Pointer to window to which the event is sent
@param pMouseEvent Mouse event to send
*/
- static ImplSVEvent * PostMouseEvent( VclEventId nEvent, vcl::Window
*pWin, MouseEvent* pMouseEvent );
+ static ImplSVEvent * PostMouseEvent( VclEventId nEvent, vcl::Window
*pWin, MouseEvent const * pMouseEvent );
/** Remove mouse and keypress events from a window... any also zoom and
scroll events
if the platform supports it.
@@ -874,7 +874,7 @@ public:
@returns Pointer to next top window.
*/
- static vcl::Window* GetNextTopLevelWindow( vcl::Window*
pWindow );
+ static vcl::Window* GetNextTopLevelWindow( vcl::Window const
* pWindow );
/** Return the number of top-level windows being used by the application
@@ -1064,7 +1064,7 @@ public:
@see InsertAccel
*/
- static void RemoveAccel( Accelerator* pAccel );
+ static void RemoveAccel( Accelerator const * pAccel );
/** Get the number of reserved key codes used by the application.
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 57624b659c58..b0528c8f8e4a 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -175,7 +175,7 @@ public:
SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
private:
- SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long
i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin );
+ SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long
i_nWidth, long i_nHeight, vcl::Window const * i_pConfigureWin );
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Timer*, void );
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 3ac8244ab45f..3980f0a98452 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -194,7 +194,7 @@ protected:
sal_Int32 GetCharPos( sal_uInt32 nPara,
std::vector<TextLine>::size_type nLine, long nDocPosX );
tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial,
bool bPreferPortionStart = false );
sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point&
rPosInPara );
- long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine*
pLine, std::size_t nTextPortion );
+ long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const
* pLine, std::size_t nTextPortion );
long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine,
sal_Int32 nIndex, bool bPreferPortionStart = false );
long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine,
sal_Int32 nIndex, sal_Int32 nIndex2 );
sal_uInt8 ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos );
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 1d066d225886..76e8e7ccbac5 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -139,8 +139,8 @@ public:
void Copy();
void Paste();
- void Copy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard );
- void Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard );
+ void Copy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard );
+ void Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard );
void Undo();
void Redo();
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index a171b6fcc584..7412452e8948 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -193,7 +193,7 @@ private:
SAL_DLLPRIVATE bool ImplHandleMouseButtonUp( const MouseEvent&
rMEvt, bool bCancel = false );
SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem,
bool bNoGrabFocus = false );
SAL_DLLPRIVATE bool ImplChangeHighlightUpDn( bool bUp, bool
bNoCycle = false );
- SAL_DLLPRIVATE ImplToolItems::size_type ImplGetItemLine( ImplToolItem*
pCurrentItem );
+ SAL_DLLPRIVATE ImplToolItems::size_type ImplGetItemLine( ImplToolItem
const * pCurrentItem );
SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem(
ImplToolItems::size_type nLine );
SAL_DLLPRIVATE bool ImplOpenItem( vcl::KeyCode aKeyCode );
SAL_DLLPRIVATE bool ImplActivateItem( vcl::KeyCode aKeyCode );
@@ -208,7 +208,7 @@ private:
SAL_DLLPRIVATE const OUString& ImplGetHelpText( sal_uInt16 nItemId ) const;
SAL_DLLPRIVATE Size ImplGetOptimalFloatingSize();
SAL_DLLPRIVATE bool ImplHasExternalMenubutton();
- SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext&
rRenderContext, ImplToolItem* pItem );
+ SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext&
rRenderContext, ImplToolItem const * pItem );
DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void*, void );
DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Timer*, void );
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 5cf906eb510c..997bc3be866a 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -26,11 +26,11 @@ public:
void logCommand(const OUString& rAction);
- void logAction(VclPtr<Control>& xUIElement, VclEventId nEvent);
+ void logAction(VclPtr<Control> const & xUIElement, VclEventId nEvent);
void log(const OUString& rString);
- void logKeyInput(VclPtr<vcl::Window>& xUIElement, const KeyEvent& rEvent);
+ void logKeyInput(VclPtr<vcl::Window> const & xUIElement, const KeyEvent&
rEvent);
static UITestLogger& getInstance();
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a7633f29c109..1422c14e4165 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -472,11 +472,11 @@ public:
// transparent background for selected or checked items in toolboxes etc.
// + selection Color with a text color complementing the selection
background
// + rounded edge
- static void DrawSelectionBackground(vcl::RenderContext& rRenderContext,
vcl::Window& rWindow,
+ static void DrawSelectionBackground(vcl::RenderContext& rRenderContext,
vcl::Window const & rWindow,
const tools::Rectangle& rRect,
sal_uInt16 nHighlight,
bool bChecked, bool bDrawBorder, bool
bDrawExtBorderOnly,
Color* pSelectionTextColor = nullptr,
long nCornerRadius = 0,
- Color* pPaintColor = nullptr);
+ Color const * pPaintColor = nullptr);
};
class VCL_DLLPUBLIC Window : public ::OutputDevice
@@ -532,7 +532,7 @@ public:
DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Timer*, void );
- SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window*
pWindow );
+ SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window const
* pWindow );
SAL_DLLPRIVATE vcl::Window* ImplGetFrameWindow() const;
SalFrame* ImplGetFrame() const;
@@ -619,7 +619,7 @@ protected:
SAL_DLLPRIVATE bool ImplSetClipFlagOverlapWindows( bool
bSysObjOnlySmaller = false );
SAL_DLLPRIVATE void PushPaintHelper(PaintHelper* pHelper,
vcl::RenderContext& rRenderContext);
- SAL_DLLPRIVATE void PopPaintHelper(PaintHelper* pHelper);
+ SAL_DLLPRIVATE void PopPaintHelper(PaintHelper const *
pHelper);
private:
@@ -645,8 +645,8 @@ private:
SAL_DLLPRIVATE void ImplInitResolutionSettings();
- SAL_DLLPRIVATE void ImplPointToLogic(vcl::RenderContext&
rRenderContext, vcl::Font& rFont) const;
- SAL_DLLPRIVATE void ImplLogicToPoint(vcl::RenderContext&
rRenderContext, vcl::Font& rFont) const;
+ SAL_DLLPRIVATE void ImplPointToLogic(vcl::RenderContext
const & rRenderContext, vcl::Font& rFont) const;
+ SAL_DLLPRIVATE void ImplLogicToPoint(vcl::RenderContext
const & rRenderContext, vcl::Font& rFont) const;
SAL_DLLPRIVATE bool ImplSysObjClip( const vcl::Region*
pOldRegion );
SAL_DLLPRIVATE void ImplUpdateSysObjChildrenClip();
@@ -892,10 +892,10 @@ public:
void NotifyAllChildren( DataChangedEvent&
rDCEvt );
void SetPointFont(vcl::RenderContext&
rRenderContext, const vcl::Font& rFont);
- vcl::Font GetPointFont(vcl::RenderContext&
rRenderContext) const;
+ vcl::Font GetPointFont(vcl::RenderContext const
& rRenderContext) const;
void SetZoomedPointFont(vcl::RenderContext&
rRenderContext, const vcl::Font& rFont);
- long GetDrawPixel( ::OutputDevice* pDev,
long nPixels ) const;
- vcl::Font GetDrawPixelFont( ::OutputDevice* pDev
) const;
+ long GetDrawPixel( ::OutputDevice const *
pDev, long nPixels ) const;
+ vcl::Font GetDrawPixelFont( ::OutputDevice const
* pDev ) const;
void SetControlFont();
void SetControlFont( const vcl::Font& rFont );
diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx
index c172cd45e86b..d17dc7ec7fce 100644
--- a/include/vcl/wmf.hxx
+++ b/include/vcl/wmf.hxx
@@ -29,7 +29,7 @@ struct WmfExternal;
VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF );
-VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream
& rTargetStream, FilterConfigItem* pConfigItem, bool bPlaceable = true );
+VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream
& rTargetStream, FilterConfigItem const * pConfigItem, bool bPlaceable = true );
bool ConvertGDIMetaFileToEMF(const GDIMetaFile & rMTF, SvStream &
rTargetStream);
diff --git a/vcl/backendtest/VisualBackendTest.cxx
b/vcl/backendtest/VisualBackendTest.cxx
index 4114f67fdce8..a83d9be8417f 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -49,7 +49,7 @@
using namespace css;
-void drawBitmapCentered(tools::Rectangle& rRect, Bitmap aBitmap,
vcl::RenderContext& rRenderContext)
+void drawBitmapCentered(tools::Rectangle const & rRect, Bitmap aBitmap,
vcl::RenderContext& rRenderContext)
{
long nWidth = rRect.GetWidth();
long nHeight = rRect.GetHeight();
@@ -64,7 +64,7 @@ void drawBitmapCentered(tools::Rectangle& rRect, Bitmap
aBitmap, vcl::RenderCont
rRenderContext.DrawBitmap(aPoint, aBitmap);
}
-void drawBitmapScaledAndCentered(tools::Rectangle& rRect, Bitmap aBitmap,
vcl::RenderContext& rRenderContext, BmpScaleFlag aFlag = BmpScaleFlag::Fast)
+void drawBitmapScaledAndCentered(tools::Rectangle const & rRect, Bitmap
aBitmap, vcl::RenderContext& rRenderContext, BmpScaleFlag aFlag =
BmpScaleFlag::Fast)
{
long nWidth = rRect.GetWidth();
long nHeight = rRect.GetHeight();
@@ -78,7 +78,7 @@ void drawBitmapScaledAndCentered(tools::Rectangle& rRect,
Bitmap aBitmap, vcl::R
drawBitmapCentered(rRect, aBitmap, rRenderContext);
}
-void drawBackgroundRect(tools::Rectangle& rRect, Color aColor,
vcl::RenderContext& rRenderContext)
+void drawBackgroundRect(tools::Rectangle const & rRect, Color aColor,
vcl::RenderContext& rRenderContext)
{
rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
rRenderContext.SetFillColor(aColor);
@@ -87,7 +87,7 @@ void drawBackgroundRect(tools::Rectangle& rRect, Color
aColor, vcl::RenderContex
rRenderContext.Pop();
}
-void assertAndSetBackground(vcl::test::TestResult eResult, tools::Rectangle&
rRect, vcl::RenderContext& rRenderContext)
+void assertAndSetBackground(vcl::test::TestResult eResult, tools::Rectangle
const & rRect, vcl::RenderContext& rRenderContext)
{
if (eResult == vcl::test::TestResult::Passed)
drawBackgroundRect(rRect, COL_GREEN, rRenderContext);
diff --git a/vcl/backendtest/outputdevice/pixel.cxx
b/vcl/backendtest/outputdevice/pixel.cxx
index 2ad49e0f2fe8..64f6fdef1979 100644
--- a/vcl/backendtest/outputdevice/pixel.cxx
+++ b/vcl/backendtest/outputdevice/pixel.cxx
@@ -16,7 +16,7 @@ namespace test {
namespace
{
-void drawPixelOffset(OutputDevice& rDevice, tools::Rectangle& rRect, int
nOffset)
+void drawPixelOffset(OutputDevice& rDevice, tools::Rectangle const & rRect,
int nOffset)
{
for (long x = 0 + nOffset; x < (rRect.GetWidth() - nOffset); ++x)
{
diff --git a/vcl/inc/BitmapProcessor.hxx b/vcl/inc/BitmapProcessor.hxx
index d76435c190fd..5f5bd8b69b6c 100644
--- a/vcl/inc/BitmapProcessor.hxx
+++ b/vcl/inc/BitmapProcessor.hxx
@@ -17,7 +17,7 @@ class VCL_DLLPUBLIC BitmapProcessor
public:
static BitmapEx createLightImage(const BitmapEx& rBitmapEx);
static BitmapEx createDisabledImage(const BitmapEx& rBitmapEx);
- static void colorizeImage(BitmapEx& rBitmapEx, Color aColor);
+ static void colorizeImage(BitmapEx const & rBitmapEx, Color aColor);
};
#endif // VCL_INC_BITMAP_PROCESSOR_HXX
diff --git a/vcl/inc/BitmapSymmetryCheck.hxx b/vcl/inc/BitmapSymmetryCheck.hxx
index ac0425db8bac..faf058923fdf 100644
--- a/vcl/inc/BitmapSymmetryCheck.hxx
+++ b/vcl/inc/BitmapSymmetryCheck.hxx
@@ -23,7 +23,7 @@ public:
static bool check(Bitmap& rBitmap);
private:
- static bool checkImpl(BitmapReadAccess* pReadAccess);
+ static bool checkImpl(BitmapReadAccess const * pReadAccess);
};
#endif // INCLUDED_VCL_INC_BITMAPSYMMETRYCHECK_HXX
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index b2b469eb6826..5cf64501cd8e 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -43,7 +43,7 @@ public:
~ImplAccelManager();
bool InsertAccel( Accelerator* pAccel );
- void RemoveAccel( Accelerator* pAccel );
+ void RemoveAccel( Accelerator const * pAccel );
void EndSequence();
void FlushAccel() { EndSequence(); }
diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx
index 2a4f6cd45a71..6e5e22544c5d 100644
--- a/vcl/inc/bmpfast.hxx
+++ b/vcl/inc/bmpfast.hxx
@@ -32,7 +32,7 @@ struct SalTwoRect;
bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc,
const SalTwoRect& rTwoRect );
-bool ImplFastBitmapBlending( BitmapWriteAccess& rDst,
+bool ImplFastBitmapBlending( BitmapWriteAccess const & rDst,
const BitmapReadAccess& rSrc, const BitmapReadAccess& rMask,
const SalTwoRect& rTwoRect );
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 247432954d4f..9c88da7d0631 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -226,9 +226,9 @@ public:
virtual tools::Rectangle GetMenuRect() const;
static void ImplInitTitle( ImplBorderFrameData* pData );
- static BorderWindowHitTest ImplHitTest( ImplBorderFrameData* pData, const
Point& rPos );
+ static BorderWindowHitTest ImplHitTest( ImplBorderFrameData const * pData,
const Point& rPos );
static bool ImplMouseMove( ImplBorderFrameData* pData, const
MouseEvent& rMEvt );
- static OUString ImplRequestHelp( ImplBorderFrameData* pData, const
Point& rPos, tools::Rectangle& rHelpRect );
+ static OUString ImplRequestHelp( ImplBorderFrameData const *
pData, const Point& rPos, tools::Rectangle& rHelpRect );
static long ImplCalcTitleWidth( const ImplBorderFrameData*
pData );
};
diff --git a/vcl/inc/displayconnectiondispatch.hxx
b/vcl/inc/displayconnectiondispatch.hxx
index 3cc605f5f752..73beb2ab4829 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -46,7 +46,7 @@ public:
void start();
void terminate();
- bool dispatchEvent( void* pData, int nBytes );
+ bool dispatchEvent( void const * pData, int nBytes );
// XDisplayConnection
virtual void SAL_CALL addEventHandler( const css::uno::Any& window, const
css::uno::Reference< css::awt::XEventHandler >& handler, sal_Int32 eventMask )
override;
diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx
index 8dc10ddecb02..eb00009028b1 100644
--- a/vcl/inc/impfontcache.hxx
+++ b/vcl/inc/impfontcache.hxx
@@ -49,10 +49,10 @@ public:
ImplFontCache();
~ImplFontCache();
- LogicalFontInstance* GetFontInstance( PhysicalFontCollection*,
+ LogicalFontInstance* GetFontInstance( PhysicalFontCollection const *,
const vcl::Font&, const Size& rPixelSize, float
fExactHeight);
- LogicalFontInstance* GetFontInstance( PhysicalFontCollection*,
FontSelectPattern& );
- LogicalFontInstance* GetGlyphFallbackFont( PhysicalFontCollection*,
FontSelectPattern&,
+ LogicalFontInstance* GetFontInstance( PhysicalFontCollection const *,
FontSelectPattern& );
+ LogicalFontInstance* GetGlyphFallbackFont( PhysicalFontCollection const *,
FontSelectPattern&,
int nFallbackLevel, OUString& rMissingCodes );
/// Increase the refcount of the given LogicalFontInstance.
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 796bb22d0d30..b37c0419a52f 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -117,7 +117,7 @@ private:
bool doLoadImage(ImageRequestParameters& rParameters);
- std::vector<OUString> getPaths(OUString const & name, LanguageTag&
rLanguageTag);
+ std::vector<OUString> getPaths(OUString const & name, LanguageTag const &
rLanguageTag);
bool checkPathAccess();
diff --git a/vcl/inc/opengl/FixedTextureAtlas.hxx
b/vcl/inc/opengl/FixedTextureAtlas.hxx
index 203550acf00d..b415efa44e26 100644
--- a/vcl/inc/opengl/FixedTextureAtlas.hxx
+++ b/vcl/inc/opengl/FixedTextureAtlas.hxx
@@ -29,7 +29,7 @@ class VCL_PLUGIN_PUBLIC FixedTextureAtlasManager
public:
FixedTextureAtlasManager(int nWidthFactor, int nHeightFactor, int
nTextureSize);
~FixedTextureAtlasManager();
- OpenGLTexture InsertBuffer(int nWidth, int nHeight, int nFormat, int
nType, sal_uInt8* pData);
+ OpenGLTexture InsertBuffer(int nWidth, int nHeight, int nFormat, int
nType, sal_uInt8 const * pData);
OpenGLTexture Reserve(int nWidth, int nHeight);
int GetSubtextureSize()
diff --git a/vcl/inc/opengl/PackedTextureAtlas.hxx
b/vcl/inc/opengl/PackedTextureAtlas.hxx
index 9640c8ff8243..d2932b7e2b37 100644
--- a/vcl/inc/opengl/PackedTextureAtlas.hxx
+++ b/vcl/inc/opengl/PackedTextureAtlas.hxx
@@ -43,7 +43,7 @@ public:
*/
PackedTextureAtlasManager(int nTextureWidth, int nTextureHeight);
~PackedTextureAtlasManager();
- OpenGLTexture InsertBuffer(int nWidth, int nHeight, int nFormat, int
nType, sal_uInt8* pData);
+ OpenGLTexture InsertBuffer(int nWidth, int nHeight, int nFormat, int
nType, sal_uInt8 const * pData);
OpenGLTexture Reserve(int nWidth, int nHeight);
std::vector<GLuint> ReduceTextureNumber(int nMaxNumberOfTextures);
};
diff --git a/vcl/inc/opengl/RenderList.hxx b/vcl/inc/opengl/RenderList.hxx
index 6188203c77ea..e25f48a99301 100644
--- a/vcl/inc/opengl/RenderList.hxx
+++ b/vcl/inc/opengl/RenderList.hxx
@@ -150,7 +150,7 @@ public:
return maRenderEntries;
}
- bool addDrawTextureWithMaskColor(OpenGLTexture& rTexture, SalColor nColor,
const SalTwoRect& r2Rect);
+ bool addDrawTextureWithMaskColor(OpenGLTexture const & rTexture, SalColor
nColor, const SalTwoRect& r2Rect);
void addDrawPixel(long nX, long nY, SalColor nColor);
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 4632ddf44444..cb6839d96536 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -83,8 +83,8 @@ public:
void SetUniform1f( const OString& rName, GLfloat v1 );
void SetUniform2f( const OString& rName, GLfloat v1, GLfloat v2 );
- void SetUniform1fv( const OString& rName, GLsizei nCount, GLfloat* aValues
);
- void SetUniform2fv( const OString& rName, GLsizei nCount, GLfloat* aValues
);
+ void SetUniform1fv( const OString& rName, GLsizei nCount, GLfloat const *
aValues );
+ void SetUniform2fv( const OString& rName, GLsizei nCount, GLfloat const *
aValues );
void SetUniform1i( const OString& rName, GLint v1 );
void SetColor( const OString& rName, const Color& rColor );
void SetColor( const OString& rName, SalColor nColor, sal_uInt8
nTransparency );
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 554058af9603..35db94236556 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -47,7 +47,7 @@ public:
ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight );
~ImplOpenGLTexture();
- bool InsertBuffer(int nX, int nY, int nWidth, int nHeight, int nFormat,
int nType, sal_uInt8* pData);
+ bool InsertBuffer(int nX, int nY, int nWidth, int nHeight, int nFormat,
int nType, sal_uInt8 const * pData);
void IncreaseRefCount(int nSlotNumber);
void DecreaseRefCount(int nSlotNumber);
@@ -109,7 +109,7 @@ public:
GLuint AddStencil();
GLuint StencilId() const;
- bool CopyData(int nWidth, int nHeight, int nFormat, int nType,
sal_uInt8* pData);
+ bool CopyData(int nWidth, int nHeight, int nFormat, int nType,
sal_uInt8 const * pData);
void SaveToFile(const OUString& rFileName);
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index 9dacf6d20f0d..524a041cb792 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,7 +31,7 @@ public:
protected:
virtual rtl::Reference<OpenGLContext> CreateWinContext() override;
- bool RenderPixmap(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
TextureCombo& rCombo);
+ bool RenderPixmap(X11Pixmap const * pPixmap, X11Pixmap const * pMask, int
nX, int nY, TextureCombo& rCombo);
public:
// implementation of X11GraphicsImpl
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 2eb39b084018..7bc6644fdc48 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -142,10 +142,10 @@ public:
void DrawLinearGradient( const Gradient& rGradient, const
tools::Rectangle& rRect );
void DrawAxialGradient( const Gradient& rGradient, const tools::Rectangle&
rRect );
void DrawRadialGradient( const Gradient& rGradient, const
tools::Rectangle& rRect );
- void DeferredTextDraw(OpenGLTexture& rTexture, const SalColor nMaskColor,
const SalTwoRect& rPosAry);
+ void DeferredTextDraw(OpenGLTexture const & rTexture, const SalColor
nMaskColor, const SalTwoRect& rPosAry);
void FlushDeferredDrawing();
- bool FlushLinesOrTriangles(DrawShaderType eType, RenderParameters&
rParameters);
+ bool FlushLinesOrTriangles(DrawShaderType eType, RenderParameters const &
rParameters);
public:
// get the width of the device
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 60e78e15d101..f691fdaedbcc 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -202,7 +202,7 @@ public:
void SetLayout( SalLayoutFlags aLayout ) {
m_nLayout = aLayout;}
void mirror( long& nX, const OutputDevice *pOutDev
) const;
- void mirror( long& nX, long& nWidth, const
OutputDevice *pOutDev, bool bBack = false ) const;
+ void mirror( long& nX, long nWidth, const
OutputDevice *pOutDev, bool bBack = false ) const;
bool mirror( sal_uInt32 nPoints, const SalPoint
*pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev ) const;
void mirror( tools::Rectangle& rRect, const
OutputDevice*, bool bBack = false ) const;
void mirror( vcl::Region& rRgn, const OutputDevice
*pOutDev ) const;
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index d8b9b0a32d64..03491553c62a 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -152,7 +152,7 @@ public:
void SetEventCallback( rtl::Reference<
vcl::DisplayConnectionDispatch > const & pInstance )
{ m_pEventInst = pInstance; }
- bool CallEventCallback( void* pEvent, int nBytes );
+ bool CallEventCallback( void const * pEvent, int nBytes
);
virtual OUString GetConnectionIdentifier() = 0;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 08cb9085b6e5..4fd0e4c25317 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -224,7 +224,7 @@ public:
// used only by OutputDevice::ImplLayout, TODO: make friend
explicit MultiSalLayout( SalLayout& rBaseLayout );
void AddFallback( SalLayout& rFallbackLayout,
- ImplLayoutRuns&, const PhysicalFontFace*
pFallbackFont );
+ ImplLayoutRuns const &, const
PhysicalFontFace* pFallbackFont );
virtual bool LayoutText( ImplLayoutArgs& ) override;
virtual void AdjustLayout( ImplLayoutArgs& ) override;
virtual void InitFont() const override;
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index dc51b9673f90..76234a9bc0fc 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -372,7 +372,7 @@ namespace vcl
sal_uInt8 *encoding,
int nGlyphs,
int nNameRecs,
- NameRecord *nr);
+ NameRecord const *nr);
/**
* Generates a new PostScript Type42 font and dumps it to <b>outf</b> file.
diff --git a/vcl/inc/svmconverter.hxx b/vcl/inc/svmconverter.hxx
index bcb11dba2535..0b2c41fa6640 100644
--- a/vcl/inc/svmconverter.hxx
+++ b/vcl/inc/svmconverter.hxx
@@ -79,8 +79,8 @@ class VCL_PLUGIN_PUBLIC SVMConverter
{
private:
SAL_DLLPRIVATE static void ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf );
- SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm,
GDIMetaFile& rMtf );
- SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm,
GDIMetaFile& rMtf,
+ SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm,
GDIMetaFile const & rMtf );
+ SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm,
GDIMetaFile const & rMtf,
VirtualDevice& rSaveVDev, bool&
rRop_0_1,
Color& rLineCol,
::std::stack<Color*>& rLineColStack,
rtl_TextEncoding& rActualCharSet );
diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
index 435b81189d81..64564237a232 100644
--- a/vcl/inc/unx/gendisp.hxx
+++ b/vcl/inc/unx/gendisp.hxx
@@ -63,7 +63,7 @@ public:
virtual void PostUserEvent() = 0;
void SendInternalEvent( SalFrame* pFrame, void* pData, SalEvent nEvent =
SalEvent::UserEvent );
- void CancelInternalEvent( SalFrame* pFrame, void* pData, SalEvent nEvent );
+ void CancelInternalEvent( SalFrame const * pFrame, void const * pData,
SalEvent nEvent );
bool DispatchInternalEvent();
bool HasUserEvents() const;
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index e79fd1fd56d4..2c99a7b3e0a1 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -112,7 +112,7 @@ public:
protected:
static void configurePspInfoPrinter( PspSalInfoPrinter* pInfoPrinter,
- SalPrinterQueueInfo* pQueueInfo,
+ SalPrinterQueueInfo const *
pQueueInfo,
ImplJobSetup* pSetupData );
};
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 05095e5c9eca..6c78ca519a1f 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -75,7 +75,7 @@ private:
// used by FreetypeFont class only
void AddedGlyph( GlyphData& );
void RemovingGlyph();
- void UsingGlyph( GlyphData& );
+ void UsingGlyph( GlyphData const & );
private:
void GarbageCollect();
@@ -132,7 +132,7 @@ public:
const FontSelectPattern& GetFontSelData() const { return
maFontSelData; }
- void GetFontMetric(ImplFontMetricDataRef&) const;
+ void GetFontMetric(ImplFontMetricDataRef const &) const;
const unsigned char* GetTable( const char* pName, sal_uLong* pLength );
const FontCharMapRef GetFontCharMap() const;
bool GetFontCapabilities(vcl::FontCapabilities &) const;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 2582314eb003..249bc1add2bf 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -167,8 +167,8 @@ public:
GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event );
void startupNotificationCompleted() { m_bStartupCompleted = true; }
- void screenSizeChanged( GdkScreen* );
- void monitorsChanged( GdkScreen* );
+ void screenSizeChanged( GdkScreen const * );
+ void monitorsChanged( GdkScreen const * );
virtual void PostUserEvent() override;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ac9e7e783cbd..dd260acfa7f0 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -122,7 +122,7 @@ class GtkSalFrame : public SalFrame
group( rPrev.group )
{}
- bool operator== (GdkEventKey *event) const
+ bool operator== (GdkEventKey const *event) const
{
return (event != nullptr)
&& (event->window == window)
@@ -396,7 +396,7 @@ public:
m_pDropTarget = pDropTarget;
}
- void deregisterDropTarget(GtkDropTarget* pDropTarget)
+ void deregisterDropTarget(GtkDropTarget const * pDropTarget)
{
assert(m_pDropTarget == pDropTarget); (void)pDropTarget;
m_pDropTarget = nullptr;
@@ -408,7 +408,7 @@ public:
m_pDragSource = pDragSource;
}
- void deregisterDragSource(GtkDragSource* pDragSource)
+ void deregisterDragSource(GtkDragSource const * pDragSource)
{
assert(m_pDragSource == pDragSource); (void)pDragSource;
m_pDragSource = nullptr;
@@ -429,7 +429,7 @@ public:
void nopaint_container_resize_children(GtkContainer*);
- void LaunchAsyncScroll(GdkEvent* pEvent);
+ void LaunchAsyncScroll(GdkEvent const * pEvent);
DECL_LINK(AsyncScroll, Timer *, void);
#endif
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 9a5ef3ed67ab..c303583941b3 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -103,7 +103,7 @@ public:
MenuItemBits nBits,
bool bChecked,
bool bIsSubmenu );
- void NativeSetEnableItem( gchar* aCommand, gboolean
bEnable );
+ void NativeSetEnableItem( gchar const * aCommand,
gboolean bEnable );
void NativeCheckItem( unsigned nSection, unsigned
nItemPos, MenuItemBits bits, gboolean bCheck );
void NativeSetAccelerator( unsigned nSection,
unsigned nItemPos, const vcl::KeyCode& rKeyCode, const OUString& rKeyName );
@@ -123,7 +123,7 @@ public:
void CreateMenuBarWidget();
void DestroyMenuBarWidget();
- gboolean SignalKey(GdkEventKey* pEvent);
+ gboolean SignalKey(GdkEventKey const * pEvent);
void ReturnFocus();
virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const
tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override;
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 17e973f2d429..b3f8b2c59b09 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -62,7 +62,7 @@ public:
void ExtendEventMask( ::Window aFocusWindow );
void SetICFocus( SalFrame* pFocusFrame );
- void UnsetICFocus( SalFrame* pFrame );
+ void UnsetICFocus( SalFrame const * pFrame );
void HandleDestroyIM();
void EndExtTextInput();
@@ -70,7 +70,7 @@ public:
int UpdateSpotLocation();
void Map( SalFrame *pFrame );
- void Unmap( SalFrame* pFrame );
+ void Unmap( SalFrame const * pFrame );
SalI18N_InputContext( SalFrame *aFrame );
~SalI18N_InputContext();
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index a232d68de2f9..dd314371578f 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -332,7 +332,7 @@ public:
{ return maVirtualStatus.mbArtItalic; }
bool GetArtificialBold() const
{ return maVirtualStatus.mbArtBold; }
- void SetTextColor (PrinterColor& rTextColor)
+ void SetTextColor (PrinterColor const & rTextColor)
{ maTextColor = rTextColor; }
void DrawGlyph(const Point& rPoint,
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 6f9de187dd11..1659cb63e876 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -85,7 +85,7 @@ public:
);
SAL_DLLPRIVATE XImage* ImplCreateXImage(
- SalDisplay* pSalDisp,
+ SalDisplay const * pSalDisp,
SalX11Screen nXScreen,
long nDepth,
const SalTwoRect& rTwoRect
@@ -228,7 +228,7 @@ public:
~ImplSalBitmapCache();
void ImplAdd( X11SalBitmap* pBmp );
- void ImplRemove( X11SalBitmap* pBmp );
+ void ImplRemove( X11SalBitmap const * pBmp );
void ImplClear();
};
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 2be2992ae520..d3a5c7b35b00 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -148,7 +148,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame,
public NativeWindowHandl
long HandleKeyEvent ( XKeyEvent *pEvent );
long HandleMouseEvent ( XEvent *pEvent );
- long HandleFocusEvent ( XFocusChangeEvent *pEvent );
+ long HandleFocusEvent ( XFocusChangeEvent const *pEvent );
long HandleExposeEvent ( XEvent *pEvent );
long HandleSizeEvent ( XConfigureEvent *pEvent );
long HandleStateEvent ( XPropertyEvent *pEvent );
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 4e9c2769ee7e..b601bd95bc42 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -195,14 +195,14 @@ public:
/*
* set NET_WM_PID
*/
- void setPID( X11SalFrame* pFrame ) const;
+ void setPID( X11SalFrame const * pFrame ) const;
/*
* set WM_CLIENT_MACHINE
*/
- void setClientMachine( X11SalFrame* pFrame ) const;
+ void setClientMachine( X11SalFrame const * pFrame ) const;
- void answerPing( X11SalFrame*, XClientMessageEvent* ) const;
+ void answerPing( X11SalFrame const *, XClientMessageEvent const * ) const;
/*
* maximizes frame
@@ -285,7 +285,7 @@ public:
* changes the transient hint of a window to reference frame
* if reference frame is NULL the root window is used instead
*/
- void changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame*
pReferenceFrame ) const;
+ void changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame const *
pReferenceFrame ) const;
};
} // namespace
diff --git a/vcl/opengl/FixedTextureAtlas.cxx b/vcl/opengl/FixedTextureAtlas.cxx
index 7a321d8cccfb..85e9f1331d49 100644
--- a/vcl/opengl/FixedTextureAtlas.cxx
+++ b/vcl/opengl/FixedTextureAtlas.cxx
@@ -125,7 +125,7 @@ OpenGLTexture FixedTextureAtlasManager::Reserve(int nWidth,
int nHeight)
return OpenGLTexture(pFixedTexture->mpTexture, aRectangle, nSlot);
}
-OpenGLTexture FixedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight,
int nFormat, int nType, sal_uInt8* pData)
+OpenGLTexture FixedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight,
int nFormat, int nType, sal_uInt8 const * pData)
{
OpenGLTexture aTexture = Reserve(nWidth, nHeight);
if (pData == nullptr)
diff --git a/vcl/opengl/PackedTextureAtlas.cxx
b/vcl/opengl/PackedTextureAtlas.cxx
index 8b20bf275cf1..bd1b829427da 100644
--- a/vcl/opengl/PackedTextureAtlas.cxx
+++ b/vcl/opengl/PackedTextureAtlas.cxx
@@ -163,7 +163,7 @@ OpenGLTexture PackedTextureAtlasManager::Reserve(int
nWidth, int nHeight)
return OpenGLTexture();
}
-OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight,
int nFormat, int nType, sal_uInt8* pData)
+OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight,
int nFormat, int nType, sal_uInt8 const * pData)
{
OpenGLTexture aTexture = Reserve(nWidth, nHeight);
if (aTexture && pData == nullptr)
diff --git a/vcl/opengl/RenderList.cxx b/vcl/opengl/RenderList.cxx
index 4df0f620587c..a0b86c4a9afa 100644
--- a/vcl/opengl/RenderList.cxx
+++ b/vcl/opengl/RenderList.cxx
@@ -348,7 +348,7 @@ void RenderList::addDrawPolyPolygon(const
basegfx::B2DPolyPolygon& rPolyPolygon,
}
}
-bool RenderList::addDrawTextureWithMaskColor(OpenGLTexture& rTexture, SalColor
nColor, const SalTwoRect& r2Rect)
+bool RenderList::addDrawTextureWithMaskColor(OpenGLTexture const & rTexture,
SalColor nColor, const SalTwoRect& r2Rect)
{
if (!rTexture)
return false;
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 342a8028cd01..60df24d784ab 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1316,13 +1316,13 @@ void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture&
rMask, SalColor nMaskColor,
mpProgram->Clean();
}
-void OpenGLSalGraphicsImpl::DeferredTextDraw(OpenGLTexture& rTexture, SalColor
aMaskColor, const SalTwoRect& rPosAry)
+void OpenGLSalGraphicsImpl::DeferredTextDraw(OpenGLTexture const & rTexture,
SalColor aMaskColor, const SalTwoRect& rPosAry)
{
mpRenderList->addDrawTextureWithMaskColor(rTexture, aMaskColor, rPosAry);
PostBatchDraw();
}
-bool OpenGLSalGraphicsImpl::FlushLinesOrTriangles(DrawShaderType eType,
RenderParameters& rParameters)
+bool OpenGLSalGraphicsImpl::FlushLinesOrTriangles(DrawShaderType eType,
RenderParameters const & rParameters)
{
if (!UseProgram("combinedVertexShader", "combinedFragmentShader", "#define
USE_VERTEX_COLORS"))
return false;
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index c3e32e627044..4da881fca210 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -213,14 +213,14 @@ void OpenGLProgram::SetUniform2f( const OString& rName,
GLfloat v1, GLfloat v2 )
CHECK_GL_ERROR();
}
-void OpenGLProgram::SetUniform1fv( const OString& rName, GLsizei nCount,
GLfloat* aValues )
+void OpenGLProgram::SetUniform1fv( const OString& rName, GLsizei nCount,
GLfloat const * aValues )
{
GLuint nUniform = GetUniformLocation( rName );
glUniform1fv( nUniform, nCount, aValues );
CHECK_GL_ERROR();
}
-void OpenGLProgram::SetUniform2fv( const OString& rName, GLsizei nCount,
GLfloat* aValues )
+void OpenGLProgram::SetUniform2fv( const OString& rName, GLsizei nCount,
GLfloat const * aValues )
{
GLuint nUniform = GetUniformLocation( rName );
glUniform2fv( nUniform, nCount, aValues );
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 5c94dfdaa2a9..01072929beb2 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -377,7 +377,7 @@ ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16
nBits, const BitmapPalet
}
void lclInstantiateTexture(OpenGLTexture& rTexture, const int nWidth, const
int nHeight,
- const GLenum nFormat, const GLenum nType,
sal_uInt8* pData)
+ const GLenum nFormat, const GLenum nType, sal_uInt8
const * pData)
{
if (nWidth == nHeight)
{
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 90cd255d8d95..35001bd02fcc 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -190,7 +190,7 @@ ImplOpenGLTexture::~ImplOpenGLTexture()
}
}
-bool ImplOpenGLTexture::InsertBuffer(int nX, int nY, int nWidth, int nHeight,
int nFormat, int nType, sal_uInt8* pData)
+bool ImplOpenGLTexture::InsertBuffer(int nX, int nY, int nWidth, int nHeight,
int nFormat, int nType, sal_uInt8 const * pData)
{
if (!pData || mnTexture == 0)
return false;
@@ -461,7 +461,7 @@ GLenum OpenGLTexture::GetFilter() const
return GL_NEAREST;
}
-bool OpenGLTexture::CopyData(int nWidth, int nHeight, int nFormat, int nType,
sal_uInt8* pData)
+bool OpenGLTexture::CopyData(int nWidth, int nHeight, int nFormat, int nType,
sal_uInt8 const * pData)
{
if (!pData || !IsValid())
return false;
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index bc5c854c51e3..07a0b6d80fe8 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -701,7 +701,7 @@ namespace
}
}
-bool X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap* pPixmap, X11Pixmap*
pMask, int nX, int nY, TextureCombo& rCombo)
+bool X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap const * pPixmap,
X11Pixmap const * pMask, int nX, int nY, TextureCombo& rCombo)
{
const int aAttribs[] =
{
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 29221658c2e2..1d8faa415222 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -232,7 +232,7 @@ void Help::UpdatePopover(sal_uIntPtr nId, vcl::Window*
pParent, const tools::Rec
pHelpWin->Invalidate();
}
-void Help::HidePopover(vcl::Window* pParent, sal_uLong nId)
+void Help::HidePopover(vcl::Window const * pParent, sal_uLong nId)
{
if (pParent->ImplGetFrame()->HidePopover(nId))
{
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0866e648acbc..93697a61ad2d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -85,7 +85,7 @@ void SalInstance::DestroyMenuItem( SalMenuItem* pItem )
OSL_ENSURE( pItem == nullptr, "DestroyMenu called with non-native menus" );
}
-bool SalInstance::CallEventCallback( void* pEvent, int nBytes )
+bool SalInstance::CallEventCallback( void const * pEvent, int nBytes )
{
return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes );
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b06b014ce5cd..0d93f95b23f5 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -893,7 +893,7 @@ bool Application::HandleKey( VclEventId nEvent, vcl::Window
*pWin, KeyEvent* pKe
return bProcessed;
}
-ImplSVEvent * Application::PostKeyEvent( VclEventId nEvent, vcl::Window *pWin,
KeyEvent* pKeyEvent )
+ImplSVEvent * Application::PostKeyEvent( VclEventId nEvent, vcl::Window *pWin,
KeyEvent const * pKeyEvent )
{
const SolarMutexGuard aGuard;
ImplSVEvent * nEventId = nullptr;
@@ -918,7 +918,7 @@ ImplSVEvent * Application::PostKeyEvent( VclEventId nEvent,
vcl::Window *pWin, K
return nEventId;
}
-ImplSVEvent * Application::PostMouseEvent( VclEventId nEvent, vcl::Window
*pWin, MouseEvent* pMouseEvent )
+ImplSVEvent * Application::PostMouseEvent( VclEventId nEvent, vcl::Window
*pWin, MouseEvent const * pMouseEvent )
{
const SolarMutexGuard aGuard;
ImplSVEvent * nEventId = nullptr;
@@ -1098,7 +1098,7 @@ vcl::Window* Application::GetFirstTopLevelWindow()
return pSVData->maWinData.mpFirstFrame;
}
-vcl::Window* Application::GetNextTopLevelWindow( vcl::Window* pWindow )
+vcl::Window* Application::GetNextTopLevelWindow( vcl::Window const * pWindow )
{
return pWindow->mpWindowImpl->mpFrameData->mpNextFrame;
}
@@ -1342,7 +1342,7 @@ bool Application::InsertAccel( Accelerator* pAccel )
return pSVData->maAppData.mpAccelMgr->InsertAccel( pAccel );
}
-void Application::RemoveAccel( Accelerator* pAccel )
+void Application::RemoveAccel( Accelerator const * pAccel )
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/bitmap/BitmapProcessor.cxx
b/vcl/source/bitmap/BitmapProcessor.cxx
index d9ab9359c08f..b6f556b9cdd9 100644
--- a/vcl/source/bitmap/BitmapProcessor.cxx
+++ b/vcl/source/bitmap/BitmapProcessor.cxx
@@ -134,7 +134,7 @@ BitmapEx BitmapProcessor::createDisabledImage(const
BitmapEx& rBitmapEx)
return aReturnBitmap;
}
-void BitmapProcessor::colorizeImage(BitmapEx& rBitmapEx, Color aColor)
+void BitmapProcessor::colorizeImage(BitmapEx const & rBitmapEx, Color aColor)
{
Bitmap aBitmap = rBitmapEx.GetBitmap();
Bitmap::ScopedWriteAccess pWriteAccess(aBitmap);
diff --git a/vcl/source/bitmap/BitmapSymmetryCheck.cxx
b/vcl/source/bitmap/BitmapSymmetryCheck.cxx
index f1a600815f1c..e5db09e463ca 100644
--- a/vcl/source/bitmap/BitmapSymmetryCheck.cxx
+++ b/vcl/source/bitmap/BitmapSymmetryCheck.cxx
@@ -22,7 +22,7 @@ bool BitmapSymmetryCheck::check(Bitmap& rBitmap)
return checkImpl(aReadAccess.get());
}
-bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess* pReadAccess)
+bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess const * pReadAccess)
{
long nHeight = pReadAccess->Height();
long nWidth = pReadAccess->Width();
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx
b/vcl/source/bitmap/bitmapscalesuper.cxx
index 15aa67e25983..00d253ad6430 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -91,7 +91,7 @@ class ScaleTask : public comphelper::ThreadTask
public:
explicit ScaleTask( const std::shared_ptr<comphelper::ThreadTaskTag>&
pTag, ScaleRangeFn pFn )
: comphelper::ThreadTask(pTag), mpFn( pFn ) {}
- void push( ScaleRangeContext &aRC ) { maStrips.push_back( aRC ); }
+ void push( ScaleRangeContext const &aRC ) { maStrips.push_back( aRC ); }
virtual void doWork() override
{
std::vector< ScaleRangeContext >::iterator it;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b93c9f7f1129..8db0bfcaa947 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -644,7 +644,7 @@ void PushButton::ImplInitPushButtonData()
namespace
{
- vcl::Window* getPreviousSibling(vcl::Window *pParent)
+ vcl::Window* getPreviousSibling(vcl::Window const *pParent)
{
return pParent ? pParent->GetWindow(GetWindowType::LastChild) :
nullptr;
}
@@ -753,7 +753,7 @@ void
PushButton::ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext,
rRect = aDecoView.DrawButton(rRect, nStyle);
}
-bool PushButton::ImplHitTestPushButton( vcl::Window* pDev,
+bool PushButton::ImplHitTestPushButton( vcl::Window const * pDev,
const Point& rPos )
{
Point aTempPoint;
@@ -799,7 +799,7 @@ DrawTextFlags PushButton::ImplGetTextStyle( DrawFlags
nDrawFlags ) const
static void ImplDrawBtnDropDownArrow( OutputDevice* pDev,
long nX, long nY,
- Color& rColor, bool bBlack )
+ Color const & rColor, bool bBlack )
{
Color aOldLineColor = pDev->GetLineColor();
Color aOldFillColor = pDev->GetFillColor();
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 211820a26d7e..dd289eff827f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -294,7 +294,7 @@ void Edit::ImplInitEditData()
mxDnDListener = pDnDWrapper;
}
-bool Edit::ImplUseNativeBorder(vcl::RenderContext& rRenderContext, WinBits
nStyle)
+bool Edit::ImplUseNativeBorder(vcl::RenderContext const & rRenderContext,
WinBits nStyle)
{
bool bRet =
rRenderContext.IsNativeControlSupported(ImplGetNativeControlType(),
ControlPart::HasBackgroundTexture)
@@ -1000,7 +1000,7 @@ void Edit::ImplClearBackground(vcl::RenderContext&
rRenderContext, const tools::
}
}
-void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart,
long nXEnd)
+void Edit::ImplPaintBorder(vcl::RenderContext const & rRenderContext, long
nXStart, long nXEnd)
{
// this is not needed when double-buffering
if (SupportsDoubleBuffering())
@@ -1276,12 +1276,12 @@ void Edit::ImplCopyToSelectionClipboard()
}
}
-void Edit::ImplCopy( uno::Reference< datatransfer::clipboard::XClipboard >&
rxClipboard )
+void Edit::ImplCopy( uno::Reference< datatransfer::clipboard::XClipboard >
const & rxClipboard )
{
vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard );
}
-void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >&
rxClipboard )
+void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >
const & rxClipboard )
{
if ( rxClipboard.is() )
{
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index e20d32ce3550..c92d8b95c78d 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -438,7 +438,7 @@ const LanguageTag& FormatterBase::GetLanguageTag() const
return mpLocaleDataWrapper->getLanguageTag();
}
-void FormatterBase::ImplSetText( const OUString& rText, Selection*
pNewSelection )
+void FormatterBase::ImplSetText( const OUString& rText, Selection const *
pNewSelection )
{
if ( mpField )
{
@@ -559,7 +559,7 @@ OUString NumericFormatter::CreateFieldText( sal_Int64
nValue ) const
return ImplGetLocaleDataWrapper().getNum( nValue, GetDecimalDigits(),
IsUseThousandSep(), IsShowTrailingZeros() );
}
-void NumericFormatter::ImplSetUserValue( sal_Int64 nNewValue, Selection*
pNewSelection )
+void NumericFormatter::ImplSetUserValue( sal_Int64 nNewValue, Selection const
* pNewSelection )
{
nNewValue = ClipAgainstMinMax(nNewValue);
mnLastValue = nNewValue;
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index ac9bb2b16305..ac2dbc913896 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1565,7 +1565,7 @@ void DateFormatter::SetDate( const Date& rNewDate )
maLastDate = GetDate();
}
-void DateFormatter::ImplSetUserDate( const Date& rNewDate, Selection*
pNewSelection )
+void DateFormatter::ImplSetUserDate( const Date& rNewDate, Selection const *
pNewSelection )
{
Date aNewDate = rNewDate;
if ( aNewDate > maMax )
@@ -2386,7 +2386,7 @@ void TimeFormatter::ImplNewFieldValue( const tools::Time&
rTime )
}
}
-void TimeFormatter::ImplSetUserTime( const tools::Time& rNewTime, Selection*
pNewSelection )
+void TimeFormatter::ImplSetUserTime( const tools::Time& rNewTime, Selection
const * pNewSelection )
{
tools::Time aNewTime = rNewTime;
if ( aNewTime > GetMax() )
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index f83ad4babcfe..174b84f9d264 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -255,7 +255,7 @@ inline bool ImplLongCurrencyGetValue( const OUString& rStr,
BigInt& rValue,
bool ImplLongCurrencyReformat( const OUString& rStr, BigInt const & nMin,
BigInt const & nMax,
sal_uInt16 nDecDigits,
const LocaleDataWrapper& rLocaleDataWrapper,
OUString& rOutStr,
- LongCurrencyFormatter& rFormatter )
+ LongCurrencyFormatter const & rFormatter )
{
BigInt nValue;
if ( !ImplNumericGetValue( rStr, nValue, nDecDigits, rLocaleDataWrapper,
true ) )
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 0f2a624ce9c1..837158350a36 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -33,7 +33,7 @@ void ProgressBar::ImplInit()
ImplInitSettings( true, true, true );
}
-static WinBits clearProgressBarBorder( vcl::Window* pParent, WinBits nOrgStyle
)
+static WinBits clearProgressBarBorder( vcl::Window const * pParent, WinBits
nOrgStyle )
{
WinBits nOutStyle = nOrgStyle;
if( pParent && (nOrgStyle & WB_BORDER) != 0 )
diff --git a/vcl/source/control/quickselectionengine.cxx
b/vcl/source/control/quickselectionengine.cxx
index c980639a5627..c04931146d72 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -70,7 +70,7 @@ namespace vcl
lcl_reset( *this );
}
- static StringEntryIdentifier findMatchingEntry( const OUString&
_searchString, QuickSelectionEngine_Data& _engineData )
+ static StringEntryIdentifier findMatchingEntry( const OUString&
_searchString, QuickSelectionEngine_Data const & _engineData )
{
const vcl::I18nHelper& rI18nHelper =
Application::GetSettings().GetLocaleI18nHelper();
// TODO: do we really need the Window's settings here? The original
code used it ...
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 353e936f596b..9ceb2b2f5164 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -68,7 +68,7 @@ void ImplGetSpinbuttonValue(vcl::Window* pWin,
rValue.mnLowerPart = bHorz ? ControlPart::ButtonRight :
ControlPart::ButtonDown;
}
-bool ImplDrawNativeSpinfield(vcl::RenderContext& rRenderContext, vcl::Window*
pWin, const SpinbuttonValue& rSpinbuttonValue)
+bool ImplDrawNativeSpinfield(vcl::RenderContext& rRenderContext, vcl::Window
const * pWin, const SpinbuttonValue& rSpinbuttonValue)
{
bool bNativeOK = false;
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index ef4edfd46537..188a3769f34e 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2884,7 +2884,7 @@ sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uInt32
nPara, sal_Int32 nPos )
return nRightToLeft;
}
-long TextEngine::ImpGetPortionXOffset( sal_uInt32 nPara, TextLine* pLine,
std::size_t nTextPortion )
+long TextEngine::ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const *
pLine, std::size_t nTextPortion )
{
long nX = pLine->GetStartX();
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 12403b0d5180..366aa5bfaf6a 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1032,7 +1032,7 @@ void TextView::Cut()
mpImpl->mpTextEngine->UndoActionEnd();
}
-void TextView::Copy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard )
+void TextView::Copy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard )
{
if ( rxClipboard.is() )
{
@@ -1063,7 +1063,7 @@ void TextView::Copy()
Copy( aClipboard );
}
-void TextView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard )
+void TextView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard )
{
if ( rxClipboard.is() )
{
diff --git a/vcl/source/filter/FilterConfigItem.cxx
b/vcl/source/filter/FilterConfigItem.cxx
index 9e41fa56acde..2047ff882215 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::container ;
using namespace ::com::sun::star::configuration;
using namespace ::com::sun::star::task ; // XStatusIndicator
-static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv,
const OUString& rTree )
+static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory > const &
rXCfgProv, const OUString& rTree )
{
bool bAvailable = !rTree.isEmpty();
if ( bAvailable )
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx
b/vcl/source/filter/GraphicNativeMetadata.cxx
index aea930d7174f..26ba4a72892e 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -32,7 +32,7 @@ GraphicNativeMetadata::~GraphicNativeMetadata()
{}
-bool GraphicNativeMetadata::read(Graphic& rGraphic)
+bool GraphicNativeMetadata::read(Graphic const & rGraphic)
{
GfxLink aLink = rGraphic.GetLink();
if ( aLink.GetType() != GfxLinkType::NativeJpg )
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index a0f9d21f9cca..b99d5e0c8490 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1313,7 +1313,7 @@ ErrCode GraphicFilter::ImportGraphic(
sal_uInt16 nFormat,
sal_uInt16* pDeterminedFormat,
GraphicFilterImportFlags nImportFlags,
- WmfExternal *pExtHeader)
+ WmfExternal const *pExtHeader)
{
return ImportGraphic( rGraphic, rPath, rIStream, nFormat,
pDeterminedFormat, nImportFlags, nullptr, pExtHeader );
}
@@ -1468,7 +1468,7 @@ void GraphicFilter::ImportGraphics(std::vector<
std::shared_ptr<Graphic> >& rGra
ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString&
rPath, SvStream& rIStream,
sal_uInt16 nFormat, sal_uInt16*
pDeterminedFormat, GraphicFilterImportFlags nImportFlags,
css::uno::Sequence<
css::beans::PropertyValue >* pFilterData,
- WmfExternal *pExtHeader )
+ WmfExternal const *pExtHeader )
{
OUString aFilterName;
OUString aExternalFilterName;
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 6ec4ba98c1ca..135eece7846a 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -255,7 +255,7 @@ sal_Int32 PDFDocument::WriteAppearanceObject()
return nAppearanceId;
}
-sal_Int32 PDFDocument::WriteAnnotObject(PDFObjectElement& rFirstPage,
sal_Int32 nSignatureId, sal_Int32 nAppearanceId)
+sal_Int32 PDFDocument::WriteAnnotObject(PDFObjectElement const & rFirstPage,
sal_Int32 nSignatureId, sal_Int32 nAppearanceId)
{
// Decide what identifier to use for the new signature.
sal_uInt32 nNextSignature = GetNextSignature();
@@ -535,7 +535,7 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId,
PDFReferenceElement*& p
return true;
}
-void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement* pRoot)
+void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const
* pRoot)
{
if (m_pXRefStream)
{
@@ -1910,7 +1910,7 @@ int PDFDocument::AsHex(char ch)
return nRet;
}
-std::vector<unsigned char> PDFDocument::DecodeHexString(PDFHexStringElement*
pElement)
+std::vector<unsigned char> PDFDocument::DecodeHexString(PDFHexStringElement
const * pElement)
{
std::vector<unsigned char> aRet;
const OString& rHex = pElement->GetValue();
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 63d756aaf5ef..9b99f445f71a 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -151,7 +151,7 @@ void ReadObjAreaType(SvStream & rInp, ObjAreaType & rArea)
rInp.ReadUInt16(rArea.FMuster);
}
-void ObjkOverSeek(SvStream& rInp, ObjkType& rObjk)
+void ObjkOverSeek(SvStream& rInp, ObjkType const & rObjk)
{
sal_uLong Siz;
Siz=(sal_uLong)rObjk.MemSize+rObjk.Last; // ObjSize+ObjAnhSize
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index f3dcc57aa352..7781849cda9d 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -616,7 +616,7 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y,
sal_uInt8 MargCond,
return 0;
}
-bool CalcSpline(tools::Polygon& rPoly, bool Periodic, sal_uInt16& n,
+bool CalcSpline(tools::Polygon const & rPoly, bool Periodic, sal_uInt16& n,
double*& ax, double*& ay, double*& bx, double*& by,
double*& cx, double*& cy, double*& dx, double*& dy, double*& T)
{
@@ -685,7 +685,7 @@ bool CalcSpline(tools::Polygon& rPoly, bool Periodic,
sal_uInt16& n,
return bRet;
}
-bool Spline2Poly(tools::Polygon& rSpln, bool Periodic, tools::Polygon& rPoly)
+bool Spline2Poly(tools::Polygon const & rSpln, bool Periodic, tools::Polygon&
rPoly)
{
const short MinKoord = -32000; // to prevent
const short MaxKoord = 32000; // overflows
diff --git a/vcl/source/filter/sgvspln.hxx b/vcl/source/filter/sgvspln.hxx
index 906dbe2c6f47..6f4543292478 100644
--- a/vcl/source/filter/sgvspln.hxx
+++ b/vcl/source/filter/sgvspln.hxx
@@ -28,7 +28,7 @@
* coefficient array has been allocated, which can be freed by the caller
* using a delete.
*/
-bool CalcSpline(tools::Polygon& rPoly, bool Periodic, sal_uInt16& n,
+bool CalcSpline(tools::Polygon const & rPoly, bool Periodic, sal_uInt16& n,
double*& ax, double*& ay, double*& bx, double*& by,
double*& cx, double*& cy, double*& dx, double*& dy, double*&
T);
@@ -39,7 +39,7 @@ bool CalcSpline(tools::Polygon& rPoly, bool Periodic,
sal_uInt16& n,
* In the first case the polygon has 0, in the second case PolyMax points.
* To prevent coordinate overflows we limit them to +/-32000.
*/
-bool Spline2Poly(tools::Polygon& rSpln, bool Periodic, tools::Polygon& rPoly);
+bool Spline2Poly(tools::Polygon const & rSpln, bool Periodic, tools::Polygon&
rPoly);
#endif // INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index e993471628b5..558c563bae24 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -152,7 +152,7 @@
// end of DefBase.Pas
-bool CheckTextOutl(ObjAreaType& F, ObjLineType& L)
+bool CheckTextOutl(ObjAreaType const & F, ObjLineType const & L)
{
return (F.FIntens!=L.LIntens) ||
((F.FFarbe!=L.LFarbe) && (F.FIntens>0)) ||
@@ -564,7 +564,7 @@ struct ProcChrSta {
ObjTextType Attrib;
};
-void InitProcessCharState(ProcChrSta& State, ObjTextType& AktAtr, sal_uInt16
IndexA)
+void InitProcessCharState(ProcChrSta& State, ObjTextType const & AktAtr,
sal_uInt16 IndexA)
{
State.Attrib=AktAtr;
State.OutCh=0;
@@ -587,7 +587,7 @@ UCHAR Upcase(UCHAR c)
return c;
}
-sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c)
+sal_uInt16 GetCharWidth(OutputDevice const & rOut, UCHAR c)
{
sal_uInt16 ChrWidth;
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index f620a8e00303..fe9a9f4429ca 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -55,7 +55,7 @@ bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF
)
}
bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream &
rTargetStream,
- FilterConfigItem* pConfigItem, bool bPlaceable)
+ FilterConfigItem const * pConfigItem, bool
bPlaceable)
{
WMFWriter aWMFWriter;
GDIMetaFile aGdiMetaFile(rMTF);
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 7facdbd8aa93..8013c1e2f09c 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -1680,7 +1680,7 @@ void WMFWriter::UpdateHeader()
}
bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
- FilterConfigItem* pFConfigItem, bool bPlaceable )
+ FilterConfigItem const * pFConfigItem, bool
bPlaceable )
{
WMFWriterAttrStackMember * pAt;
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 39474c94cc39..c0fd6e5fca56 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -198,7 +198,7 @@ private:
public:
WMFWriter();
- bool WriteWMF(const GDIMetaFile & rMTF, SvStream & rTargetStream,
FilterConfigItem* pFilterConfigItem, bool bPlaceable);
+ bool WriteWMF(const GDIMetaFile & rMTF, SvStream & rTargetStream,
FilterConfigItem const * pFilterConfigItem, bool bPlaceable);
};
#endif
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 61d310b9a3ca..8b26edacb5fa 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -99,7 +99,7 @@ ImplFontCache::~ImplFontCache()
}
}
-LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection*
pFontList,
+LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection
const * pFontList,
const vcl::Font& rFont, const Size& rSize, float fExactHeight )
{
const OUString& aSearchName = rFont.GetFamilyName();
@@ -109,7 +109,7 @@ LogicalFontInstance* ImplFontCache::GetFontInstance(
PhysicalFontCollection* pFo
return GetFontInstance( pFontList, aFontSelData );
}
-LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection*
pFontList,
+LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection
const * pFontList,
FontSelectPattern& aFontSelData )
{
// check if a directly matching logical font instance is already cached,
@@ -206,7 +206,7 @@ LogicalFontInstance* ImplFontCache::GetFontInstance(
PhysicalFontCollection* pFo
return pFontInstance;
}
-LogicalFontInstance* ImplFontCache::GetGlyphFallbackFont(
PhysicalFontCollection* pFontCollection,
+LogicalFontInstance* ImplFontCache::GetGlyphFallbackFont(
PhysicalFontCollection const * pFontCollection,
FontSelectPattern& rFontSelData, int nFallbackLevel, OUString&
rMissingCodes )
{
// get a candidate font for glyph fallback
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 58cd9f398850..3cffc299c073 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -262,7 +262,7 @@ static int XUnits(int unitsPerEm, int n)
return (n * 1000) / unitsPerEm;
}
-static const sal_uInt8* getTable( TrueTypeFont *ttf, sal_uInt32 ord)
+static const sal_uInt8* getTable( TrueTypeFont const *ttf, sal_uInt32 ord)
{
return ttf->tables[ord];
}
@@ -338,7 +338,7 @@ static void HexFmtBlockWrite(HexFmt *_this, const void
*ptr, sal_uInt32 size)
/* Outline Extraction functions */
/* fills the aw and lsb entries of the TTGlyphMetrics structure from hmtx
table -*/
-static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 glyphID, TTGlyphMetrics
*metrics)
+static void GetMetrics(TrueTypeFont const *ttf, sal_uInt32 glyphID,
TTGlyphMetrics *metrics)
{
const sal_uInt8* table = getTable( ttf, O_hmtx );
@@ -1927,7 +1927,7 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf,
sal_uInt8 *encoding,
int nGlyphs,
int nNameRecs,
- NameRecord *nr)
+ NameRecord const *nr)
{
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
