[Libreoffice-commits] core.git: include/vcl vcl/backendtest vcl/inc vcl/opengl vcl/qa vcl/source vcl/unx vcl/win vcl/workben
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 14 09:41:00 UTC 2018
include/vcl/BitmapAlphaClampFilter.hxx | 2
include/vcl/BitmapColorQuantizationFilter.hxx | 2
include/vcl/BitmapDuoToneFilter.hxx | 4 -
include/vcl/BitmapEmbossGreyFilter.hxx | 4 -
include/vcl/BitmapGaussianSeparableBlurFilter.hxx | 2
include/vcl/BitmapMonochromeFilter.hxx | 2
include/vcl/BitmapMosaicFilter.hxx | 4 -
include/vcl/BitmapSeparableUnsharpenFilter.hxx | 2
include/vcl/BitmapSimpleColorQuantizationFilter.hxx | 2
include/vcl/BitmapSmoothenFilter.hxx | 2
include/vcl/BitmapSolarizeFilter.hxx | 2
include/vcl/BitmapTools.hxx | 4 -
include/vcl/bitmapaccess.hxx | 2
include/vcl/builder.hxx | 24 +++++------
include/vcl/commandevent.hxx | 12 ++---
include/vcl/dialog.hxx | 4 -
include/vcl/dockwin.hxx | 12 ++---
include/vcl/errinf.hxx | 8 +--
include/vcl/event.hxx | 10 ++--
include/vcl/evntpost.hxx | 2
include/vcl/filter/pdfdocument.hxx | 6 +-
include/vcl/font/Feature.hxx | 2
include/vcl/gfxlink.hxx | 2
include/vcl/graph.hxx | 8 +--
include/vcl/graphicfilter.hxx | 4 -
include/vcl/i18nhelp.hxx | 2
include/vcl/metaact.hxx | 6 +-
include/vcl/opengl/OpenGLContext.hxx | 2
include/vcl/pdfwriter.hxx | 2
include/vcl/ppdparser.hxx | 2
include/vcl/print.hxx | 6 +-
include/vcl/salctype.hxx | 2
include/vcl/salnativewidgets.hxx | 2
include/vcl/svapp.hxx | 2
include/vcl/textdata.hxx | 4 -
include/vcl/txtattr.hxx | 4 -
include/vcl/unohelp2.hxx | 2
include/vcl/vclevent.hxx | 2
include/vcl/vectorgraphicdata.hxx | 4 -
include/vcl/weld.hxx | 2
include/vcl/xtextedt.hxx | 2
vcl/backendtest/VisualBackendTest.cxx | 2
vcl/inc/BitmapColorizeFilter.hxx | 2
vcl/inc/BitmapFastScaleFilter.hxx | 6 +-
vcl/inc/BitmapInterpolateScaleFilter.hxx | 4 -
vcl/inc/BitmapScaleConvolutionFilter.hxx | 4 -
vcl/inc/BitmapScaleSuperFilter.hxx | 4 -
vcl/inc/ControlCacheKey.hxx | 8 +--
vcl/inc/PhysicalFontFamily.hxx | 2
vcl/inc/canvasbitmap.hxx | 2
vcl/inc/font/FeatureCollector.hxx | 4 -
vcl/inc/headless/svpframe.hxx | 2
vcl/inc/headless/svpvd.hxx | 4 -
vcl/inc/image.h | 2
vcl/inc/impanmvw.hxx | 18 ++++----
vcl/inc/impfontcharmap.hxx | 2
vcl/inc/impfontmetricdata.hxx | 2
vcl/inc/implimagetree.hxx | 4 -
vcl/inc/listbox.hxx | 6 +-
vcl/inc/opengl/FixedTextureAtlas.hxx | 6 +-
vcl/inc/opengl/LineRenderUtils.hxx | 6 +-
vcl/inc/opengl/PackedTextureAtlas.hxx | 4 -
vcl/inc/opengl/texture.hxx | 2
vcl/inc/opengl/watchdog.hxx | 2
vcl/inc/opengl/zone.hxx | 2
vcl/inc/outdev.h | 2
vcl/inc/printdlg.hxx | 14 +++---
vcl/inc/printerinfomanager.hxx | 2
vcl/inc/sallayout.hxx | 6 +-
vcl/inc/salsession.hxx | 6 +-
vcl/inc/salwtype.hxx | 4 -
vcl/inc/unx/fc_fontoptions.hxx | 2
vcl/inc/unx/freetype_glyphcache.hxx | 4 -
vcl/inc/unx/gendata.hxx | 2
vcl/inc/unx/glyphcache.hxx | 4 -
vcl/inc/unx/gtk/gtkdata.hxx | 2
vcl/inc/unx/gtk/gtkgdi.hxx | 4 -
vcl/inc/unx/gtk/gtksalmenu.hxx | 6 +-
vcl/inc/unx/i18n_status.hxx | 2
vcl/inc/unx/salbmp.h | 4 -
vcl/inc/unx/saldisp.hxx | 2
vcl/inc/unx/salgdi.h | 2
vcl/inc/unx/wmadaptor.hxx | 2
vcl/opengl/PackedTextureAtlas.cxx | 2
vcl/opengl/salbmp.cxx | 6 +-
vcl/opengl/x11/gdiimpl.cxx | 2
vcl/qa/api/XGraphicTest.cxx | 7 +--
vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 7 +--
vcl/qa/cppunit/canvasbitmaptest.cxx | 2
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 10 +---
vcl/qa/cppunit/timer.cxx | 4 -
vcl/source/app/salvtables.cxx | 6 +-
vcl/source/app/svapp.cxx | 2
vcl/source/app/svmain.cxx | 4 -
vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 4 -
vcl/source/control/edit.cxx | 4 -
vcl/source/edit/textdat2.hxx | 8 +--
vcl/source/edit/textund2.hxx | 14 +++---
vcl/source/filter/graphicfilter.cxx | 4 -
vcl/source/filter/igif/decode.hxx | 6 +-
vcl/source/filter/ixbm/xbmread.cxx | 2
vcl/source/filter/ixpm/rgbtable.hxx | 6 +-
vcl/source/filter/ixpm/xpmread.cxx | 2
vcl/source/filter/jpeg/Exif.hxx | 2
vcl/source/filter/jpeg/JpegReader.hxx | 4 -
vcl/source/fontsubset/cff.cxx | 2
vcl/source/fontsubset/sft.cxx | 6 +-
vcl/source/gdi/CommonSalLayout.cxx | 6 +-
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/impvect.cxx | 6 +-
vcl/source/gdi/pdfextoutdevdata.cxx | 4 -
vcl/source/gdi/pdffontcache.hxx | 6 +-
vcl/source/gdi/pdfwriter_impl.hxx | 42 ++++++++++----------
vcl/source/gdi/pdfwriter_impl2.cxx | 10 ++--
vcl/source/gdi/pngread.cxx | 2
vcl/source/gdi/print3.cxx | 2
vcl/source/gdi/textlayout.cxx | 2
vcl/source/graphic/GraphicObject.cxx | 2
vcl/source/opengl/OpenGLHelper.cxx | 2
vcl/source/uitest/uno/uiobject_uno.cxx | 4 -
vcl/source/window/debugevent.cxx | 6 +-
vcl/source/window/dockmgr.cxx | 4 -
vcl/source/window/dockwin.cxx | 2
vcl/source/window/errinf.cxx | 2
vcl/source/window/layout.cxx | 6 +-
vcl/source/window/menuitemlist.hxx | 2
vcl/source/window/paint.cxx | 2
vcl/source/window/winproc.cxx | 2
vcl/unx/generic/app/keysymnames.cxx | 4 -
vcl/unx/generic/app/saldisp.cxx | 4 -
vcl/unx/generic/dtrans/X11_clipboard.hxx | 2
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 6 +-
vcl/unx/generic/dtrans/X11_selection.cxx | 2
vcl/unx/generic/dtrans/X11_transferable.hxx | 2
vcl/unx/generic/fontmanager/fontmanager.cxx | 4 -
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 12 ++---
vcl/unx/generic/gdi/xrender_peer.hxx | 2
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2
vcl/unx/generic/print/bitmap_gfx.cxx | 10 ++--
vcl/unx/generic/print/genprnpsp.cxx | 4 -
vcl/unx/generic/print/genpspgraphics.cxx | 2
vcl/unx/generic/print/glyphset.hxx | 4 -
vcl/unx/generic/print/prtsetup.hxx | 2
vcl/unx/generic/printer/printerinfomanager.cxx | 4 -
vcl/unx/gtk/a11y/atkhypertext.cxx | 2
vcl/unx/gtk/a11y/atktextattributes.cxx | 2
vcl/unx/gtk/a11y/atkwrapper.cxx | 4 -
vcl/unx/gtk/a11y/atkwrapper.hxx | 4 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 4 -
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 2
vcl/unx/gtk/fpicker/resourceprovider.cxx | 2
vcl/unx/gtk/glomenu.cxx | 2
vcl/unx/gtk3/cairo_gtk3_cairo.hxx | 2
vcl/win/window/salframe.cxx | 7 ---
vcl/workben/vcldemo.cxx | 8 +--
155 files changed, 336 insertions(+), 345 deletions(-)
New commits:
commit 59887868da3499c68d5f259cfa48178354397448
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 13 13:08:33 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 14 11:40:32 2018 +0200
loplugin:constfields in vcl
Change-Id: I1072642be4fdfa720e61f2d7bad3c2701eb81610
Reviewed-on: https://gerrit.libreoffice.org/60430
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx
index 39c039cbd02c..f4325b8b9e15 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -28,7 +28,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt8 mcThreshold;
+ sal_uInt8 const mcThreshold;
};
#endif
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx b/include/vcl/BitmapColorQuantizationFilter.hxx
index 170b0d88a471..4be1ff3b9f49 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -31,7 +31,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt16 mnNewColorCount;
+ sal_uInt16 const mnNewColorCount;
struct PopularColorCount
{
diff --git a/include/vcl/BitmapDuoToneFilter.hxx b/include/vcl/BitmapDuoToneFilter.hxx
index ce29a2c93c6b..3b6ee1523a4e 100644
--- a/include/vcl/BitmapDuoToneFilter.hxx
+++ b/include/vcl/BitmapDuoToneFilter.hxx
@@ -27,8 +27,8 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uLong mnColorOne;
- sal_uLong mnColorTwo;
+ sal_uLong const mnColorOne;
+ sal_uLong const mnColorTwo;
};
#endif
diff --git a/include/vcl/BitmapEmbossGreyFilter.hxx b/include/vcl/BitmapEmbossGreyFilter.hxx
index eebb2d3ecc8e..e81d3e7b7493 100644
--- a/include/vcl/BitmapEmbossGreyFilter.hxx
+++ b/include/vcl/BitmapEmbossGreyFilter.hxx
@@ -27,8 +27,8 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt16 mnAzimuthAngle100;
- sal_uInt16 mnElevationAngle100;
+ sal_uInt16 const mnAzimuthAngle100;
+ sal_uInt16 const mnElevationAngle100;
};
#endif
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
index fde41c935dc6..b3388cd0990d 100644
--- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
@@ -34,7 +34,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- double mfRadius;
+ double const mfRadius;
bool convolutionPass(Bitmap& rBitmap, Bitmap& aNewBitmap, BitmapReadAccess const* pReadAcc,
int aNumberOfContributions, const double* pWeights, int const* pPixels,
diff --git a/include/vcl/BitmapMonochromeFilter.hxx b/include/vcl/BitmapMonochromeFilter.hxx
index 09723b7a4009..0c344b467d94 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/BitmapMonochromeFilter.hxx
@@ -37,7 +37,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt8 mcThreshold;
+ sal_uInt8 const mcThreshold;
};
#endif
diff --git a/include/vcl/BitmapMosaicFilter.hxx b/include/vcl/BitmapMosaicFilter.hxx
index f38e0ac1c6d5..f52a947a151d 100644
--- a/include/vcl/BitmapMosaicFilter.hxx
+++ b/include/vcl/BitmapMosaicFilter.hxx
@@ -31,8 +31,8 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uLong mnTileWidth;
- sal_uLong mnTileHeight;
+ sal_uLong const mnTileWidth;
+ sal_uLong const mnTileHeight;
};
#endif
diff --git a/include/vcl/BitmapSeparableUnsharpenFilter.hxx b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
index 91fcbf479498..daa063aef547 100644
--- a/include/vcl/BitmapSeparableUnsharpenFilter.hxx
+++ b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
@@ -29,7 +29,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- double mfRadius;
+ double const mfRadius;
};
#endif
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
index 200e35356b07..5072c3f17cd8 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
@@ -31,7 +31,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt16 mnNewColorCount;
+ sal_uInt16 const mnNewColorCount;
};
#endif
diff --git a/include/vcl/BitmapSmoothenFilter.hxx b/include/vcl/BitmapSmoothenFilter.hxx
index 3403b99ea5ee..90503ef3789d 100644
--- a/include/vcl/BitmapSmoothenFilter.hxx
+++ b/include/vcl/BitmapSmoothenFilter.hxx
@@ -26,7 +26,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- double mfRadius;
+ double const mfRadius;
};
#endif
diff --git a/include/vcl/BitmapSolarizeFilter.hxx b/include/vcl/BitmapSolarizeFilter.hxx
index f91a9fd287aa..ff6b35f328a5 100644
--- a/include/vcl/BitmapSolarizeFilter.hxx
+++ b/include/vcl/BitmapSolarizeFilter.hxx
@@ -26,7 +26,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt8 mcSolarGreyThreshold;
+ sal_uInt8 const mcSolarGreyThreshold;
};
#endif
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 75eb6ed53077..90c45fc6ebde 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -35,8 +35,8 @@ class VCL_DLLPUBLIC RawBitmap
{
friend BitmapEx VCL_DLLPUBLIC CreateFromData( RawBitmap&& rawBitmap );
std::unique_ptr<sal_uInt8[]> mpData;
- Size maSize;
- sal_uInt8 mnBitCount;
+ Size const maSize;
+ sal_uInt8 const mnBitCount;
public:
RawBitmap(Size const & rSize, sal_uInt8 nBitCount)
: maSize(rSize),
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 91343e501ea7..9117b57730e4 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -145,7 +145,7 @@ protected:
Bitmap maBitmap;
BitmapBuffer* mpBuffer;
ColorMask maColorMask;
- BitmapAccessMode mnAccessMode;
+ BitmapAccessMode const mnAccessMode;
};
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 25380a6ec5af..0ae018a601dc 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -148,7 +148,7 @@ private:
struct MenuAndId
{
- OString m_sID;
+ OString const m_sID;
VclPtr<PopupMenu> m_pMenu;
MenuAndId(const OString &rId, PopupMenu *pMenu);
~MenuAndId();
@@ -157,8 +157,8 @@ private:
struct StringPair
{
- OString m_sID;
- OString m_sValue;
+ OString const m_sID;
+ OString const m_sValue;
StringPair(const OString &rId, const OString &rValue)
: m_sID(rId)
, m_sValue(rValue)
@@ -181,9 +181,9 @@ private:
struct ButtonImageWidgetMap
{
- OString m_sID;
- OUString m_sValue;
- bool m_bRadio;
+ OString const m_sID;
+ OUString const m_sValue;
+ bool const m_bRadio;
ButtonImageWidgetMap(const OString &rId, const OUString &rValue, bool bRadio)
: m_sID(rId)
, m_sValue(rValue)
@@ -199,9 +199,9 @@ private:
struct ComboBoxModelMap
{
- OString m_sID;
- OUString m_sValue;
- sal_Int32 m_nActiveId;
+ OString const m_sID;
+ OUString const m_sValue;
+ sal_Int32 const m_nActiveId;
ComboBoxModelMap(const OString &rId, const OUString &rValue, sal_Int32 nActiveId)
: m_sID(rId)
, m_sValue(rValue)
@@ -297,12 +297,12 @@ private:
OString m_sID;
OString m_sHelpRoot;
- ResHookProc m_pStringReplace;
+ ResHookProc const m_pStringReplace;
VclPtr<vcl::Window> m_pParent;
bool m_bToplevelHasDeferredInit;
bool m_bToplevelHasDeferredProperties;
bool m_bToplevelParentFound;
- bool m_bLegacy;
+ bool const m_bLegacy;
std::unique_ptr<ParserState> m_pParserState;
vcl::Window *get_by_name(const OString& sID);
@@ -317,7 +317,7 @@ private:
bool operator()(const vcl::Window *pA, const vcl::Window *pB) const;
private:
- VclBuilder *m_pBuilder;
+ VclBuilder * const m_pBuilder;
};
/// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold).
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index 703741051205..d8f20a381be5 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -91,7 +91,7 @@ public:
class VCL_DLLPUBLIC CommandExtTextInputData
{
private:
- OUString maText;
+ OUString const maText;
std::unique_ptr<ExtTextInputAttr[]> mpTextAttr;
sal_Int32 mnCursorPos;
sal_uInt16 mnCursorFlags;
@@ -203,7 +203,7 @@ enum class ShowDialogId
class VCL_DLLPUBLIC CommandDialogData
{
- ShowDialogId m_nDialogId;
+ ShowDialogId const m_nDialogId;
public:
CommandDialogData( ShowDialogId nDialogId )
: m_nDialogId( nDialogId )
@@ -239,7 +239,7 @@ enum class MediaCommand
class VCL_DLLPUBLIC CommandMediaData
{
- MediaCommand m_nMediaId;
+ MediaCommand const m_nMediaId;
bool m_bPassThroughToOS;
public:
CommandMediaData(MediaCommand nMediaId)
@@ -267,7 +267,7 @@ public:
class VCL_DLLPUBLIC CommandSwipeData
{
- double mnVelocityX;
+ double const mnVelocityX;
public:
CommandSwipeData()
: mnVelocityX(0)
@@ -283,8 +283,8 @@ public:
class VCL_DLLPUBLIC CommandLongPressData
{
- double mnX;
- double mnY;
+ double const mnX;
+ double const mnY;
public:
CommandLongPressData()
: mnX(0)
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 984330476a1a..1996ac8651e4 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -53,8 +53,8 @@ private:
bool mbInClose;
bool mbModalMode;
bool mbPaintComplete;
- bool mbForceBorderWindow;
- InitFlag mnInitFlag; // used for deferred init
+ bool const mbForceBorderWindow;
+ InitFlag const mnInitFlag; // used for deferred init
VclPtr<VclButtonBox> mpActionArea;
VclPtr<VclBox> mpContentArea;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index a4f99a7e2ffa..d2e6a585d633 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -31,7 +31,7 @@
// data to be sent with docking events
struct DockingData
{
- Point maMousePos; // in
+ Point const maMousePos; // in
tools::Rectangle maTrackRect; // in/out
bool mbFloating; // out
@@ -42,9 +42,9 @@ struct DockingData
struct EndDockingData
{
- tools::Rectangle maWindowRect; // in
- bool mbFloating; // in
- bool mbCancelled; // in
+ tools::Rectangle const maWindowRect; // in
+ bool const mbFloating; // in
+ bool const mbCancelled; // in
EndDockingData( const tools::Rectangle& rRect, bool b, bool bCancelled ) :
maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled )
@@ -53,8 +53,8 @@ struct EndDockingData
struct EndPopupModeData
{
- Point maFloatingPos; // in
- bool mbTearoff; // in
+ Point const maFloatingPos; // in
+ bool const mbTearoff; // in
EndPopupModeData( const Point& rPos, bool bTearoff ) :
maFloatingPos( rPos ), mbTearoff( bTearoff )
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index a7160dfd695d..f34d5624b991 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -149,7 +149,7 @@ public:
static std::unique_ptr<ErrorInfo> GetErrorInfo(ErrCode);
private:
- ErrCode nUserId;
+ ErrCode const nUserId;
};
class SAL_WARN_UNUSED VCL_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
@@ -178,7 +178,7 @@ public:
const OUString& GetErrorString() const { return aString; }
private:
- OUString aString;
+ OUString const aString;
};
@@ -193,8 +193,8 @@ public:
const OUString& GetArg2() const { return aArg2; }
private:
- OUString aArg1;
- OUString aArg2;
+ OUString const aArg1;
+ OUString const aArg2;
};
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 22486490977a..688811746ccc 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -190,7 +190,7 @@ namespace o3tl
class VCL_DLLPUBLIC HelpEvent
{
private:
- Point maPos;
+ Point const maPos;
HelpEventMode mnMode;
bool mbKeyboardActivated;
@@ -220,9 +220,9 @@ private:
/// RenderContext to which we should draw - can be a VirtualDevice or anything.
VclPtr<vcl::RenderContext> mpRenderContext;
- tools::Rectangle maOutRect;
- sal_uInt16 mnItemId;
- sal_uInt16 mnStyle;
+ tools::Rectangle const maOutRect;
+ sal_uInt16 const mnItemId;
+ sal_uInt16 const mnStyle;
public:
UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext,
@@ -249,7 +249,7 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR
class VCL_DLLPUBLIC TrackingEvent
{
private:
- MouseEvent maMEvt;
+ MouseEvent const maMEvt;
TrackingEventFlags mnFlags;
public:
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index bbd11ce2d24d..4650fbc5c6e4 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -30,7 +30,7 @@ namespace vcl
class VCL_DLLPUBLIC EventPoster
{
ImplSVEvent * m_nId;
- Link<LinkParamNone*,void> m_aLink;
+ Link<LinkParamNone*,void> const m_aLink;
DECL_DLLPRIVATE_LINK( DoEvent_Impl, void*, void );
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 03180fd0597f..7735a52591bd 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -141,7 +141,7 @@ class VCL_DLLPUBLIC PDFArrayElement : public PDFElement
{
std::vector<PDFElement*> m_aElements;
/// The object that contains this array.
- PDFObjectElement* m_pObject;
+ PDFObjectElement* const m_pObject;
public:
PDFArrayElement(PDFObjectElement* pObject);
@@ -178,7 +178,7 @@ public:
/// Stream object: a byte array with a known length.
class VCL_DLLPUBLIC PDFStreamElement : public PDFElement
{
- size_t m_nLength;
+ size_t const m_nLength;
sal_uInt64 m_nOffset;
/// The byte array itself.
SvMemoryStream m_aMemory;
@@ -197,7 +197,7 @@ class VCL_DLLPUBLIC PDFNameElement : public PDFElement
/// Offset after the '/' token.
sal_uInt64 m_nLocation = 0;
/// Length till the next token start.
- sal_uInt64 m_nLength = 0;
+ sal_uInt64 const m_nLength = 0;
public:
PDFNameElement();
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index aca557e4e53a..299d0a55a9f2 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -99,7 +99,7 @@ struct VCL_DLLPUBLIC Feature
Feature(FeatureID const& rID, FeatureType eType);
FeatureID m_aID;
- FeatureType m_eType;
+ FeatureType const m_eType;
FeatureDefinition m_aDefinition;
};
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 29e7a0e53c88..5df70b8bc53d 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -60,7 +60,7 @@ private:
SwapOutData(const OUString &aURL);
~SwapOutData();
- OUString maURL; // File is removed in the destructor
+ OUString const maURL; // File is removed in the destructor
};
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index ab9713daff9b..3b91a3269478 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -76,11 +76,11 @@ private:
class VCL_DLLPUBLIC GraphicConversionParameters
{
private:
- Size maSizePixel; // default is (0,0)
+ Size const maSizePixel; // default is (0,0)
- bool mbUnlimitedSize : 1; // default is false
- bool mbAntiAliase : 1; // default is false
- bool mbSnapHorVerLines : 1; // default is false
+ bool const mbUnlimitedSize : 1; // default is false
+ bool const mbAntiAliase : 1; // default is false
+ bool const mbSnapHorVerLines : 1; // default is false
public:
GraphicConversionParameters(
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 8c5ce93221f2..d14ee7754699 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -143,7 +143,7 @@ class VCL_DLLPUBLIC GraphicDescriptor final
sal_uInt16 nBitsPerPixel;
sal_uInt16 nPlanes;
GraphicFileFormat nFormat;
- bool bOwnStream;
+ bool const bOwnStream;
sal_uInt8 mnNumberOfImageComponents;
void ImpConstruct();
@@ -319,7 +319,7 @@ private:
DECL_LINK( FilterCallback, ConvertData&, bool );
std::unique_ptr<FilterErrorEx> pErrorEx;
- bool bUseConfig;
+ bool const bUseConfig;
};
#endif // INCLUDED_VCL_GRAPHICFILTER_HXX
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index a18d7fcd4958..8742093ebe36 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -49,7 +49,7 @@ namespace vcl
class VCL_DLLPUBLIC I18nHelper
{
::osl::Mutex maMutex;
- LanguageTag maLanguageTag;
+ LanguageTag const maLanguageTag;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
std::unique_ptr<LocaleDataWrapper> mpLocaleDataWrapper;
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index ef582b1f97dd..278e22df9b5f 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -65,7 +65,7 @@ struct ImplMetaWriteData
class VCL_DLLPUBLIC MetaAction : public salhelper::SimpleReferenceObject
{
private:
- MetaActionType mnType;
+ MetaActionType const mnType;
protected:
virtual ~MetaAction() override;
@@ -847,7 +847,7 @@ class VCL_DLLPUBLIC MetaMaskAction : public MetaAction
private:
Bitmap maBmp;
- Color maColor;
+ Color const maColor;
Point maPt;
public:
@@ -881,7 +881,7 @@ class VCL_DLLPUBLIC MetaMaskScaleAction : public MetaAction
private:
Bitmap maBmp;
- Color maColor;
+ Color const maColor;
Point maPt;
Size maSz;
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index fc4f74b0be1e..a5493c0d6927 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -168,7 +168,7 @@ protected:
bool mbInitialized;
int mnRefCount;
bool mbRequestLegacyContext;
- bool mbUseDoubleBufferedRendering;
+ bool const mbUseDoubleBufferedRendering;
bool mbVCLOnly;
int mnFramebufferCount;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 9177f99f6cb4..04d3e472e649 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -221,7 +221,7 @@ public:
struct VCL_DLLPUBLIC AnyWidget
{
- WidgetType Type; // primitive RTTI
+ WidgetType const Type; // primitive RTTI
public:
OUString Name; // a distinct name to identify the control
OUString Description;// descriptive text for the control (e.g. for tool tip)
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 382756b18e9f..ce578c1733c3 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -65,7 +65,7 @@ class VCL_DLLPUBLIC PPDKey
typedef std::unordered_map< OUString, PPDValue > hash_type;
typedef std::vector< PPDValue* > value_type;
- OUString m_aKey;
+ OUString const m_aKey;
hash_type m_aValues;
value_type m_aOrderedValues;
const PPDValue* m_pDefaultValue;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a582fe20a119..b6bed16e6243 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -614,9 +614,9 @@ public:
// helper functions for user to create a single control
struct UIControlOptions
{
- OUString maDependsOnName;
- sal_Int32 mnDependsOnEntry;
- bool mbAttachToDependency;
+ OUString const maDependsOnName;
+ sal_Int32 const mnDependsOnEntry;
+ bool const mbAttachToDependency;
OUString maGroupHint;
bool mbInternalOnly;
bool mbEnabled;
diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx
index 893adb4d47e4..73b29b1e97d7 100644
--- a/include/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
@@ -49,7 +49,7 @@ public:
Graphic maGraphic;
SvStream& mrStm;
- ConvertDataFormat mnFormat;
+ ConvertDataFormat const mnFormat;
ConvertData( const Graphic& rGraphic, SvStream& rStm, ConvertDataFormat nFormat ) :
maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {}
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 3f27365604b0..47b2255c06af 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -249,7 +249,7 @@ class VCL_DLLPUBLIC ImplControlValue
friend class SalFrame;
private:
- ControlType mType;
+ ControlType const mType;
ButtonValue mTristate; // Tristate value: on, off, mixed
long mNumber; // numeric value
protected:
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 92a422cb7072..e3c33af5d774 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -219,7 +219,7 @@ public:
}
private:
- Type aEvent;
+ Type const aEvent;
std::vector<OUString> aData;
};
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 2e595fb8995e..339c539597d2 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -115,7 +115,7 @@ inline bool TextSelection::operator != ( const TextSelection& rSel ) const
class VCL_DLLPUBLIC TextHint : public SfxHint
{
private:
- sal_uLong mnValue;
+ sal_uLong const mnValue;
public:
TextHint( SfxHintId nId );
@@ -126,7 +126,7 @@ public:
struct TEIMEInfos
{
- OUString aOldTextAfterStartPos;
+ OUString const aOldTextAfterStartPos;
std::unique_ptr<ExtTextInputAttr[]> pAttribs;
TextPaM aPos;
sal_Int32 nLen;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index db8da72f3d47..7754c061e413 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -62,7 +62,7 @@ public:
class VCL_DLLPUBLIC TextAttribFontColor : public TextAttrib
{
private:
- Color maColor;
+ Color const maColor;
public:
TextAttribFontColor( const Color& rColor );
@@ -78,7 +78,7 @@ public:
class VCL_DLLPUBLIC TextAttribFontWeight : public TextAttrib
{
private:
- FontWeight meWeight;
+ FontWeight const meWeight;
public:
TextAttribFontWeight( FontWeight eWeight );
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index e428d30a0110..6a59541198a0 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -37,7 +37,7 @@ namespace vcl { namespace unohelper {
public ::cppu::OWeakObject
{
private:
- OUString maText;
+ OUString const maText;
public:
TextDataObject( const OUString& rText );
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 8f15df2228c4..9f1d0e802f91 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -209,7 +209,7 @@ class VCL_DLLPUBLIC VclMenuEvent : public VclSimpleEvent
{
private:
VclPtr<Menu> pMenu;
- sal_uInt16 mnPos;
+ sal_uInt16 const mnPos;
VclMenuEvent(VclMenuEvent &) = delete;
void operator =(VclMenuEvent) = delete;
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index c258182bc120..ea7615d2bdf6 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -55,7 +55,7 @@ private:
VectorGraphicDataArray maVectorGraphicDataArray;
// The absolute Path if available
- OUString maPath;
+ OUString const maPath;
// on demand created content
bool mbSequenceCreated;
@@ -63,7 +63,7 @@ private:
std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > maSequence;
BitmapEx maReplacement;
size_t mNestedBitmapSize;
- VectorGraphicDataType meVectorGraphicDataType;
+ VectorGraphicDataType const meVectorGraphicDataType;
// extra:
std::unique_ptr<WmfExternal> mpExternalHeader;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 6f6776f38b57..5c82b6d3dc27 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -741,7 +741,7 @@ public:
class VCL_DLLPUBLIC TimeSpinButton
{
protected:
- TimeFieldFormat m_eFormat;
+ TimeFieldFormat const m_eFormat;
std::unique_ptr<weld::SpinButton> m_xSpinButton;
Link<TimeSpinButton&, void> m_aValueChangedHdl;
diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx
index 23b0d05bf336..fc742d9aaa8e 100644
--- a/include/vcl/xtextedt.hxx
+++ b/include/vcl/xtextedt.hxx
@@ -33,7 +33,7 @@ namespace util {
class VCL_DLLPUBLIC ExtTextEngine : public TextEngine
{
private:
- OUString maGroupChars;
+ OUString const maGroupChars;
public:
ExtTextEngine();
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index c2231b66a2ad..3b1627c33b8f 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -105,7 +105,7 @@ class VisualBackendTestWindow : public WorkWindow
private:
Timer maUpdateTimer;
std::vector<std::chrono::high_resolution_clock::time_point> mTimePoints;
- unsigned char mnNumberOfTests;
+ unsigned char const mnNumberOfTests;
unsigned char mnTest;
bool mbAnimate;
ScopedVclPtr<VirtualDevice> mpVDev;
diff --git a/vcl/inc/BitmapColorizeFilter.hxx b/vcl/inc/BitmapColorizeFilter.hxx
index 0d2ab8176f93..2795d7a95ad3 100644
--- a/vcl/inc/BitmapColorizeFilter.hxx
+++ b/vcl/inc/BitmapColorizeFilter.hxx
@@ -26,7 +26,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- Color maColor;
+ Color const maColor;
};
#endif
diff --git a/vcl/inc/BitmapFastScaleFilter.hxx b/vcl/inc/BitmapFastScaleFilter.hxx
index 1b156d670b91..1d7d771f3633 100644
--- a/vcl/inc/BitmapFastScaleFilter.hxx
+++ b/vcl/inc/BitmapFastScaleFilter.hxx
@@ -26,9 +26,9 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- double mfScaleX;
- double mfScaleY;
- Size maSize;
+ double const mfScaleX;
+ double const mfScaleY;
+ Size const maSize;
};
#endif
diff --git a/vcl/inc/BitmapInterpolateScaleFilter.hxx b/vcl/inc/BitmapInterpolateScaleFilter.hxx
index 7ab36c94ed1b..37d570997493 100644
--- a/vcl/inc/BitmapInterpolateScaleFilter.hxx
+++ b/vcl/inc/BitmapInterpolateScaleFilter.hxx
@@ -26,8 +26,8 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- double mfScaleX;
- double mfScaleY;
+ double const mfScaleX;
+ double const mfScaleY;
};
#endif
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index b3db59065c7c..41edc2acc645 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -41,8 +41,8 @@ protected:
private:
std::unique_ptr<Kernel> mxKernel;
- double mrScaleX;
- double mrScaleY;
+ double const mrScaleX;
+ double const mrScaleY;
};
class VCL_DLLPUBLIC BitmapScaleBilinearFilter : public BitmapScaleConvolutionFilter
diff --git a/vcl/inc/BitmapScaleSuperFilter.hxx b/vcl/inc/BitmapScaleSuperFilter.hxx
index 7fa26f0c769a..879f5a75c46d 100644
--- a/vcl/inc/BitmapScaleSuperFilter.hxx
+++ b/vcl/inc/BitmapScaleSuperFilter.hxx
@@ -31,8 +31,8 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmap) const override;
private:
- double mrScaleX;
- double mrScaleY;
+ double const mrScaleX;
+ double const mrScaleY;
};
diff --git a/vcl/inc/ControlCacheKey.hxx b/vcl/inc/ControlCacheKey.hxx
index 810d6e19f0f7..11d4ce07d719 100644
--- a/vcl/inc/ControlCacheKey.hxx
+++ b/vcl/inc/ControlCacheKey.hxx
@@ -26,10 +26,10 @@
class ControlCacheKey
{
public:
- ControlType mnType;
- ControlPart mnPart;
- ControlState mnState;
- Size maSize;
+ ControlType const mnType;
+ ControlPart const mnPart;
+ ControlState const mnState;
+ Size const maSize;
ControlCacheKey(ControlType nType, ControlPart nPart, ControlState nState, const Size& rSize)
: mnType(nType)
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index 990256590c88..88437a58f8b0 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -81,7 +81,7 @@ private:
std::vector< rtl::Reference<PhysicalFontFace> > maFontFaces;
OUString maFamilyName; // original font family name
- OUString maSearchName; // normalized font family name
+ OUString const maSearchName; // normalized font family name
OUString maMapNames; // fontname aliases
FontTypeFaces mnTypeFaces; // Typeface Flags
FontFamily meFamily;
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index e62bbe0af49e..a7c912bfc3c8 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -39,7 +39,7 @@ namespace unotools
css::rendering::XIntegerBitmapColorSpace >
{
private:
- BitmapEx m_aBmpEx;
+ BitmapEx const m_aBmpEx;
::Bitmap m_aBitmap;
::Bitmap m_aAlpha;
Bitmap::ScopedReadAccess m_pBmpAcc;
diff --git a/vcl/inc/font/FeatureCollector.hxx b/vcl/inc/font/FeatureCollector.hxx
index aa6f51c3d83b..6ad2dfb8b076 100644
--- a/vcl/inc/font/FeatureCollector.hxx
+++ b/vcl/inc/font/FeatureCollector.hxx
@@ -23,9 +23,9 @@ namespace font
class FeatureCollector
{
private:
- hb_face_t* m_pHbFace;
+ hb_face_t* const m_pHbFace;
std::vector<vcl::font::Feature>& m_rFontFeatures;
- LanguageType m_eLanguageType;
+ LanguageType const m_eLanguageType;
public:
FeatureCollector(hb_face_t* pHbFace, std::vector<vcl::font::Feature>& rFontFeatures,
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 16de568794f8..309a7b5ce523 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -41,7 +41,7 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
SvpSalInstance* m_pInstance;
SvpSalFrame* m_pParent; // pointer to parent frame
std::list< SvpSalFrame* > m_aChildren; // List of child frames
- SalFrameStyleFlags m_nStyle;
+ SalFrameStyleFlags const m_nStyle;
bool m_bVisible;
#ifndef IOS
cairo_surface_t* m_pSurface;
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index e68680c79901..776cee7cde15 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -29,8 +29,8 @@ typedef struct _cairo_surface cairo_surface_t;
class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice
{
- DeviceFormat m_eFormat;
- cairo_surface_t* m_pRefSurface;
+ DeviceFormat const m_eFormat;
+ cairo_surface_t* const m_pRefSurface;
cairo_surface_t* m_pSurface;
basegfx::B2IVector m_aFrameSize;
std::vector< SvpSalGraphics* > m_aGraphics;
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 873fc98432dd..1cb0c43cdd72 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -28,7 +28,7 @@
struct ImplImage
{
BitmapChecksum maBitmapChecksum;
- BitmapEx maBitmapEx;
+ BitmapEx const maBitmapEx;
BitmapEx maDisabledBitmapEx;
ImplImage(const BitmapEx& rBitmapEx);
diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx
index 97b5a5333425..702443404ac2 100644
--- a/vcl/inc/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -46,13 +46,13 @@ private:
friend class Animation;
- Animation* mpParent;
- VclPtr<OutputDevice> mpOut;
- long mnExtraData;
- Point maPt;
- Point maDispPt;
- Point maRestPt;
- Size maSz;
+ Animation* const mpParent;
+ VclPtr<OutputDevice> mpOut;
+ long const mnExtraData;
+ Point const maPt;
+ Point maDispPt;
+ Point maRestPt;
+ Size const maSz;
Size maSzPix;
Size maDispSz;
Size maRestSz;
@@ -63,8 +63,8 @@ private:
Disposal meLastDisposal;
bool mbPause;
bool mbMarked;
- bool mbHMirr;
- bool mbVMirr;
+ bool const mbHMirr;
+ bool const mbVMirr;
public:
~ImplAnimView();
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
index 67ba048153fa..2d3c5ac16c89 100644
--- a/vcl/inc/impfontcharmap.hxx
+++ b/vcl/inc/impfontcharmap.hxx
@@ -47,7 +47,7 @@ private:
const sal_uInt32* mpRangeCodes; // pairs of StartCode/(EndCode+1)
const int* mpStartGlyphs; // range-specific mapper to glyphs
const sal_uInt16* mpGlyphIds; // individual glyphid mappings
- int mnRangeCount;
+ int const mnRangeCount;
int mnCharCount; // covered codepoints
};
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 28e0ab3798a2..1c9b14a5098f 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -100,7 +100,7 @@ private:
bool ShouldUseWinMetrics(vcl::TTGlobalFontInfo& rInfo);
// font instance attributes from the font request
- long mnHeight; // Font size
+ long const mnHeight; // Font size
long mnWidth; // Reference Width
short mnOrientation; // Rotation in 1/10 degrees
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index e35c9ac6ccfb..3768b04388b3 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -41,10 +41,10 @@ namespace com { namespace sun { namespace star { namespace container {
struct ImageRequestParameters
{
OUString msName;
- OUString msStyle;
+ OUString const msStyle;
BitmapEx& mrBitmap;
bool mbLocalized;
- ImageLoadFlags meFlags;
+ ImageLoadFlags const meFlags;
bool mbWriteImageToCache;
ImageRequestParameters(const OUString & rName, const OUString & rStyle, BitmapEx& rBitmap, bool bLocalized, ImageLoadFlags eFlags)
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 5e9b20291c22..44c27b50db06 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -45,9 +45,9 @@ enum LB_EVENT_TYPE
struct ImplEntryType
{
- OUString maStr;
- SalLayoutGlyphs maStrGlyphs;
- Image maImage;
+ OUString const maStr;
+ SalLayoutGlyphs maStrGlyphs;
+ Image const maImage;
void* mpUserData;
bool mbIsSelected;
ListBoxEntryFlags mnFlags;
diff --git a/vcl/inc/opengl/FixedTextureAtlas.hxx b/vcl/inc/opengl/FixedTextureAtlas.hxx
index 5d4eff4d0804..c273a5e36c0c 100644
--- a/vcl/inc/opengl/FixedTextureAtlas.hxx
+++ b/vcl/inc/opengl/FixedTextureAtlas.hxx
@@ -20,9 +20,9 @@ class VCL_PLUGIN_PUBLIC FixedTextureAtlasManager
{
std::vector<std::unique_ptr<FixedTexture>> maFixedTextures;
- int mWidthFactor;
- int mHeightFactor;
- int mSubTextureSize;
+ int const mWidthFactor;
+ int const mHeightFactor;
+ int const mSubTextureSize;
void CreateNewTexture();
diff --git a/vcl/inc/opengl/LineRenderUtils.hxx b/vcl/inc/opengl/LineRenderUtils.hxx
index eec665f68edb..4ffeae25dd0a 100644
--- a/vcl/inc/opengl/LineRenderUtils.hxx
+++ b/vcl/inc/opengl/LineRenderUtils.hxx
@@ -22,9 +22,9 @@ private:
std::vector<Vertex>& mrVertices;
std::vector<GLuint>& mrIndices;
GLubyte mR, mG, mB, mA;
- GLfloat mfLineWidth;
- GLfloat mfLineWidthAndAA;
- size_t mnInitialIndexSize;
+ GLfloat const mfLineWidth;
+ GLfloat const mfLineWidthAndAA;
+ size_t const mnInitialIndexSize;
bool mbIncomplete;
public:
diff --git a/vcl/inc/opengl/PackedTextureAtlas.hxx b/vcl/inc/opengl/PackedTextureAtlas.hxx
index cbe865a4d5a9..8e6def84c9e4 100644
--- a/vcl/inc/opengl/PackedTextureAtlas.hxx
+++ b/vcl/inc/opengl/PackedTextureAtlas.hxx
@@ -30,8 +30,8 @@ class VCL_PLUGIN_PUBLIC PackedTextureAtlasManager
{
std::vector<std::unique_ptr<PackedTexture>> maPackedTextures;
- int mnTextureWidth;
- int mnTextureHeight;
+ int const mnTextureWidth;
+ int const mnTextureHeight;
void CreateNewTexture();
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 470d2c4e343e..98bd79977ff4 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -35,7 +35,7 @@ class ImplOpenGLTexture
public:
GLuint mnTexture;
int mnWidth;
- int mnHeight;
+ int const mnHeight;
GLenum mnFilter;
GLuint mnOptStencil;
diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index cbf7e04958ae..d37066e80e0c 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -20,7 +20,7 @@ struct WatchdogTimingsValues
{
/// delays to take various actions in 1/4 of a second increments.
int mnDisableEntries;
- int mnAbortAfter;
+ int const mnAbortAfter;
};
enum class WatchdogTimingMode
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index 75ebad915b60..50fd04598193 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -43,7 +43,7 @@ public:
/// Create this to not only enter the zone, but set VCL context.
class OpenGLVCLContextZone {
- OpenGLZone aZone;
+ OpenGLZone const aZone;
public:
OpenGLVCLContextZone();
};
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index f0ea310b1788..7d5f471cd434 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -86,7 +86,7 @@ struct ImplFontSubstEntry
{
OUString maSearchName;
OUString maSearchReplaceName;
- AddFontSubstituteFlags mnFlags;
+ AddFontSubstituteFlags const mnFlags;
ImplFontSubstEntry( const OUString& rFontName, const OUString& rSubstFontName, AddFontSubstituteFlags nSubstFlags );
};
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 3aae7dd89103..626e3ccd9403 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -46,7 +46,7 @@ namespace vcl
sal_Int32 mnDPIY;
BitmapEx maPreviewBitmap;
OUString maReplacementString;
- OUString maToolTipString;
+ OUString const maToolTipString;
bool mbGreyscale;
VclPtr<FixedLine> maHorzDim;
VclPtr<FixedLine> maVertDim;
@@ -145,8 +145,8 @@ namespace vcl
VclPtr<FixedImage> mpCollateImage;
VclPtr<CheckBox> mpReverseOrderBox;
- BitmapEx maCollateBmp;
- BitmapEx maNoCollateBmp;
+ BitmapEx const maCollateBmp;
+ BitmapEx const maNoCollateBmp;
long mnCollateUIMode;
@@ -187,7 +187,7 @@ namespace vcl
VclPtr<HelpButton> mpHelpButton;
OUString maPageStr;
- OUString maNoPageStr;
+ OUString const maNoPageStr;
sal_Int32 mnCurPage;
sal_Int32 mnCachedPages;
@@ -203,9 +203,9 @@ namespace vcl
/// internal, used for automatic Nup-Portrait/landscape
Size maFirstPageSize;
- OUString maPrintToFileText;
- OUString maPrintText;
- OUString maDefPrtText;
+ OUString const maPrintToFileText;
+ OUString maPrintText;
+ OUString const maDefPrtText;
bool mbShowLayoutPage;
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 212d75f47739..dbfb14bec43e 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -113,7 +113,7 @@ protected:
std::unique_ptr<SystemQueueInfo>
m_pQueueInfo;
- Type m_eType;
+ Type const m_eType;
bool m_bUseIncludeFeature;
bool m_bUseJobPatch;
OUString m_aSystemDefaultPaper;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index a6505eb92d35..a9dc45b78d44 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -77,11 +77,11 @@ class ImplLayoutArgs
{
public:
// string related inputs
- LanguageTag maLanguageTag;
+ LanguageTag const maLanguageTag;
SalLayoutFlags mnFlags;
const OUString& mrStr;
- int mnMinCharPos;
- int mnEndCharPos;
+ int const mnMinCharPos;
+ int const mnEndCharPos;
// performance hack
vcl::TextLayoutCache const* m_pTextLayoutCache;
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index fb9763bb6882..f065343e8e2a 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -32,7 +32,7 @@ enum SalSessionEventType
struct SalSessionEvent
{
- SalSessionEventType m_eType;
+ SalSessionEventType const m_eType;
SalSessionEvent( SalSessionEventType eType )
: m_eType( eType )
@@ -41,7 +41,7 @@ struct SalSessionEvent
struct SalSessionInteractionEvent : public SalSessionEvent
{
- bool m_bInteractionGranted;
+ bool const m_bInteractionGranted;
SalSessionInteractionEvent( bool bGranted )
: SalSessionEvent( Interaction ),
@@ -51,7 +51,7 @@ struct SalSessionInteractionEvent : public SalSessionEvent
struct SalSessionSaveRequestEvent : public SalSessionEvent
{
- bool m_bShutdown;
+ bool const m_bShutdown;
SalSessionSaveRequestEvent( bool bShutdown )
: SalSessionEvent( SaveRequest ),
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 4f7c2f6a186f..342f18d3ec85 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -198,8 +198,8 @@ struct SalSurroundingTextRequestEvent
struct SalSurroundingTextSelectionChangeEvent
{
- sal_uLong mnStart; // The beginning index of selected range
- sal_uLong mnEnd; // The end index of selected range
+ sal_uLong const mnStart; // The beginning index of selected range
+ sal_uLong const mnEnd; // The end index of selected range
};
struct SalQueryCharPositionEvent
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index 9cbb1cce172b..4e21a4d28c3e 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -38,7 +38,7 @@ public:
FcPattern* GetPattern() const;
static void cairo_font_options_substitute(FcPattern* pPattern);
private:
- FcPattern* mpPattern;
+ FcPattern* const mpPattern;
};
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx
index b1db824ccdd3..3e27aa6592ad 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -80,7 +80,7 @@ private:
FreetypeFontFile* const mpFontFile;
const int mnFaceNum;
int mnRefCount;
- sal_IntPtr mnFontId;
+ sal_IntPtr const mnFontId;
FontAttributes maDevFontAttributes;
FontCharMapRef mxFontCharMap;
@@ -109,7 +109,7 @@ private:
class FreetypeFontFace : public PhysicalFontFace
{
private:
- FreetypeFontInfo* mpFreetypeFontInfo;
+ FreetypeFontInfo* const mpFreetypeFontInfo;
public:
FreetypeFontFace( FreetypeFontInfo*, const FontAttributes& );
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 0c043c34e023..c2ac8b1b6fa4 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -28,7 +28,7 @@ enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
class VCL_DLLPUBLIC GenericUnixSalData : public SalData
{
protected:
- GenericUnixSalDataType m_eType;
+ GenericUnixSalDataType const m_eType;
SalGenericDisplay *m_pDisplay;
// cached hostname to avoid slow lookup
OUString m_aHostname;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 203fa031d8db..38e63cbd9b1e 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -88,7 +88,7 @@ private:
typedef std::unordered_map<rtl::Reference<LogicalFontInstance>,std::unique_ptr<FreetypeFont>,IFSD_Hash,IFSD_Equal > FontList;
FontList maFontList;
- sal_uLong mnMaxSize; // max overall cache size in bytes
+ sal_uLong const mnMaxSize; // max overall cache size in bytes
mutable sal_uLong mnBytesUsed;
mutable long mnLruIndex;
mutable int mnGlyphCount;
@@ -176,7 +176,7 @@ private:
long mnSin;
int mnWidth;
- int mnPrioAntiAlias;
+ int const mnPrioAntiAlias;
FreetypeFontInfo* mpFontInfo;
FT_Int mnLoadFlags;
double mfStretch;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 14330d70fb9e..fc226a0a00d5 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -139,7 +139,7 @@ class GtkSalDisplay : public SalDisplay
#endif
{
GtkSalSystem* m_pSys;
- GdkDisplay* m_pGdkDisplay;
+ GdkDisplay* const m_pGdkDisplay;
o3tl::enumarray<PointerStyle, GdkCursor*> m_aCursors;
bool m_bStartupCompleted;
bool m_bX11Display;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index fc896db7f913..107e79babba9 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -100,7 +100,7 @@ typedef void (*gtk_widget_path_iter_set_object_nameFunc)(GtkWidgetPath *, guint,
class GtkSalGraphics : public SvpSalGraphics
{
- GtkSalFrame *mpFrame;
+ GtkSalFrame * const mpFrame;
public:
GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow );
virtual bool drawNativeControl( ControlType nType, ControlPart nPart,
@@ -136,7 +136,7 @@ public:
GtkStyleContext* createOldContext(GtkControlPart ePart);
GtkStyleContext* makeContext(GtkWidgetPath *pPath, GtkStyleContext *pParent);
private:
- GtkWidget *mpWindow;
+ GtkWidget * const mpWindow;
static GtkStyleContext *mpWindowStyle;
static GtkStyleContext *mpButtonStyle;
static GtkStyleContext *mpLinkButtonStyle;
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index b9ac55570f0d..2c287aa93354 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -50,7 +50,7 @@ private:
Idle maUpdateMenuBarIdle;
bool mbInActivateCallback;
- bool mbMenuBar;
+ bool const mbMenuBar;
bool mbNeedsUpdate;
bool mbReturnFocusToDocument;
bool mbAddedGrab;
@@ -144,8 +144,8 @@ public:
GtkSalMenuItem( const SalItemParams* );
virtual ~GtkSalMenuItem() override;
- sal_uInt16 mnId; // Item ID
- MenuItemType mnType; // Item type
+ sal_uInt16 const mnId; // Item ID
+ MenuItemType const mnType; // Item type
bool mbVisible; // Item visibility.
GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted
GtkSalMenu* mpSubMenu; // Submenu of this item (if defined)
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 3bc64fcca34e..3a98941714ee 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -53,7 +53,7 @@ class I18NStatus
private:
SalFrame* m_pParent;
VclPtr<StatusWindow> m_pStatusWindow;
- OUString m_aCurrentIM;
+ OUString const m_aCurrentIM;
I18NStatus();
~I18NStatus();
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 82ed6c3bd724..5286ee2d984b 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -158,8 +158,8 @@ private:
Pixmap maPixmap;
SalTwoRect maTwoRect;
- long mnDepth;
- SalX11Screen mnXScreen;
+ long const mnDepth;
+ SalX11Screen const mnXScreen;
static void ImplDraw(
Drawable aSrcDrawable,
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 0bef7afb6c52..44fb08b87a91 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -285,7 +285,7 @@ protected:
SalX11Screen m_nXDefaultScreen;
std::vector< ScreenData > m_aScreens;
- ScreenData m_aInvalidScreenData;
+ ScreenData const m_aInvalidScreenData;
Pair aResolution_; // [dpi]
sal_uLong nMaxRequestSize_; // [byte]
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index d6054eae4b4c..94f4a9a00a06 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -344,7 +344,7 @@ protected:
bool bWindow_ : 1; // is Window
bool bVirDev_ : 1; // is VirDev
bool bFontGC_ : 1; // is Font GC valid
- bool m_bOpenGL : 1;
+ bool const m_bOpenGL : 1;
private:
std::unique_ptr<SalGraphicsImpl> mxImpl;
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index ff76cf638987..6ebc983ab768 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -127,7 +127,7 @@ public:
static const int decoration_All = 0x10000000;
protected:
- SalDisplay* m_pSalDisplay; // Display to use
+ SalDisplay* const m_pSalDisplay; // Display to use
Display* m_pDisplay; // X Display of SalDisplay
OUString m_aWMName;
Atom m_aWMAtoms[ NetAtomMax];
diff --git a/vcl/opengl/PackedTextureAtlas.cxx b/vcl/opengl/PackedTextureAtlas.cxx
index 4e2695e5ae6e..98cffcd78b37 100644
--- a/vcl/opengl/PackedTextureAtlas.cxx
+++ b/vcl/opengl/PackedTextureAtlas.cxx
@@ -20,7 +20,7 @@
struct Node
{
- tools::Rectangle mRectangle;
+ tools::Rectangle const mRectangle;
std::unique_ptr<Node> mLeftNode;
std::unique_ptr<Node> mRightNode;
bool mOccupied;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index fd07b1659f0d..5a5a2d4fc3d9 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -434,9 +434,9 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const int nWidth, const int
class ScanlineWriter
{
BitmapPalette& maPalette;
- sal_uInt8 mnColorsPerByte; // number of colors that are stored in one byte
- sal_uInt8 mnColorBitSize; // number of bits a color takes
- sal_uInt8 mnColorBitMask; // bit mask used to isolate the color
+ sal_uInt8 const mnColorsPerByte; // number of colors that are stored in one byte
+ sal_uInt8 const mnColorBitSize; // number of bits a color takes
+ sal_uInt8 const mnColorBitMask; // bit mask used to isolate the color
sal_uInt8* mpCurrentScanline;
long mnX;
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index bcb533b56bf8..6f230ce81360 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -81,7 +81,7 @@ namespace
{
private:
errorHandler oldErrorHandler;
- Display* mdpy;
+ Display* const mdpy;
public:
TempErrorHandler(Display* dpy, errorHandler newErrorHandler)
diff --git a/vcl/qa/api/XGraphicTest.cxx b/vcl/qa/api/XGraphicTest.cxx
index 1dc9a1c1fe65..0272c24645cc 100644
--- a/vcl/qa/api/XGraphicTest.cxx
+++ b/vcl/qa/api/XGraphicTest.cxx
@@ -26,20 +26,19 @@ namespace
{
using namespace css;
+static OUString const gaDataUrl = "/vcl/qa/api/data/";
+
class XGraphicTest : public test::BootstrapFixture
{
public:
- OUString maDataUrl;
-
XGraphicTest()
: BootstrapFixture(true, false)
- , maDataUrl("/vcl/qa/api/data/")
{
}
OUString getFullUrl(const OUString& sFileName)
{
- return m_directories.getURLFromSrc(maDataUrl) + sFileName;
+ return m_directories.getURLFromSrc(gaDataUrl) + sFileName;
}
void testGraphic();
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index c2455e1e4e16..b6f2dbbd3d99 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -20,19 +20,18 @@
#include <vcl/graphicfilter.hxx>
+static OUString const gaDataUrl = "/vcl/qa/cppunit/bitmaprender/data/";
+
class BitmapRenderTest : public test::BootstrapFixture
{
- OUString maDataUrl;
-
OUString getFullUrl(const OUString& sFileName)
{
- return m_directories.getURLFromSrc(maDataUrl) + sFileName;
+ return m_directories.getURLFromSrc(gaDataUrl) + sFileName;
}
public:
BitmapRenderTest()
: BootstrapFixture(true, false)
- , maDataUrl("/vcl/qa/cppunit/bitmaprender/data/")
{
}
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 52d3769ce74e..8cbbae5496a0 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -245,7 +245,7 @@ class TestBitmap : public cppu::WeakImplHelper< rendering::XIntegerReadOnlyBitma
rendering::XIntegerBitmapColorSpace >
{
private:
- geometry::IntegerSize2D maSize;
+ geometry::IntegerSize2D const maSize;
uno::Sequence<sal_Int8> maComponentTags;
uno::Sequence<sal_Int32> maComponentBitCounts;
rendering::IntegerBitmapLayout maLayout;
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index f9a780187d51..d63b6b276a58 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -14,22 +14,18 @@
#include <vcl/bitmapaccess.hxx>
#include <bitmapwriteaccess.hxx>
+static OUString const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
+
class JpegReaderTest : public test::BootstrapFixtureBase
{
- OUString maDataUrl;
-
OUString getFullUrl(const OUString& sFileName)
{
- return m_directories.getURLFromSrc(maDataUrl) + sFileName;
+ return m_directories.getURLFromSrc(gaDataUrl) + sFileName;
}
Graphic loadJPG(const OUString& aURL);
public:
- JpegReaderTest() :
- maDataUrl("/vcl/qa/cppunit/jpeg/data/")
- {}
-
void testReadRGB();
void testReadGray();
void testReadCMYK();
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 1e57f27884bd..4c4ed630c601 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -31,7 +31,7 @@
/// Avoid our timer tests just wedging the build if they fail.
class WatchDog : public osl::Thread
{
- sal_Int32 mnSeconds;
+ sal_Int32 const mnSeconds;
public:
explicit WatchDog(sal_Int32 nSeconds) :
Thread(),
@@ -450,7 +450,7 @@ void TimerTest::testInvokedReStart()
class IdleSerializer : public Idle
{
- sal_uInt32 mnPosition;
+ sal_uInt32 const mnPosition;
sal_uInt32 &mrProcesed;
public:
IdleSerializer( const sal_Char *pDebugName,
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index f32c36af335d..473cc6725dde 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -186,7 +186,7 @@ private:
DECL_LINK(FocusInListener, VclWindowEvent&, void);
DECL_LINK(FocusOutListener, VclWindowEvent&, void);
- bool m_bTakeOwnership;
+ bool const m_bTakeOwnership;
public:
SalInstanceWidget(vcl::Window* pWidget, bool bTakeOwnership)
@@ -459,7 +459,7 @@ class SalInstanceMenu : public weld::Menu
private:
VclPtr<PopupMenu> m_xMenu;
- bool m_bTakeOwnership;
+ bool const m_bTakeOwnership;
public:
SalInstanceMenu(PopupMenu* pMenu, bool bTakeOwnership)
@@ -997,7 +997,7 @@ class SalInstanceButton : public SalInstanceContainer, public virtual weld::Butt
{
private:
VclPtr<::Button> m_xButton;
- Link<::Button*,void> m_aOldClickHdl;
+ Link<::Button*,void> const m_aOldClickHdl;
DECL_LINK(ClickHdl, ::Button*, void);
public:
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 565f349072fb..d4a0ae409acf 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -155,7 +155,7 @@ extern "C" {
struct ImplPostEventData
{
- VclEventId mnEvent;
+ VclEventId const mnEvent;
VclPtr<vcl::Window> mpWin;
ImplSVEvent * mnEventId;
KeyEvent maKeyEvent;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index b4cfa736792c..ca26d1451613 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -599,8 +599,8 @@ void DeInitVCL()
// only one call is allowed
struct WorkerThreadData
{
- oslWorkerFunction pWorker;
- void * pThreadData;
+ oslWorkerFunction const pWorker;
+ void * const pThreadData;
WorkerThreadData( oslWorkerFunction pWorker_, void * pThreadData_ )
: pWorker( pWorker_ )
, pThreadData( pThreadData_ )
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index 9668a4a28a45..ac6568925cee 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -49,7 +49,7 @@ void generateMap(long nW, long nDstW, bool bHMirr, long* pMapIX, long* pMapFX)
}
struct ScaleContext {
- BitmapReadAccess *mpSrc;
+ BitmapReadAccess * const mpSrc;
BitmapWriteAccess *mpDest;
long mnSrcW, mnDestW;
long mnSrcH, mnDestH;
@@ -90,7 +90,7 @@ typedef void (*ScaleRangeFn)(ScaleContext &rCtx, long nStartY, long nEndY);
class ScaleTask : public comphelper::ThreadTask
{
- ScaleRangeFn mpFn;
+ ScaleRangeFn const mpFn;
std::vector< ScaleRangeContext > maStrips;
public:
explicit ScaleTask( const std::shared_ptr<comphelper::ThreadTaskTag>& pTag, ScaleRangeFn pFn )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 5f1f309e21d4..b40b3df51c6c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -111,10 +111,10 @@ struct DDInfo
struct Impl_IMEInfos
{
- OUString aOldTextAfterStartPos;
+ OUString const aOldTextAfterStartPos;
std::unique_ptr<ExtTextInputAttr[]>
pAttribs;
- sal_Int32 nPos;
+ sal_Int32 const nPos;
sal_Int32 nLen;
bool bCursor;
bool bWasCursorOverwrite;
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 29589aadcffd..303bc79295e5 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -99,9 +99,9 @@ public:
struct TEWritingDirectionInfo
{
- bool bLeftToRight;
- sal_Int32 nStartPos;
- sal_Int32 nEndPos;
+ bool const bLeftToRight;
+ sal_Int32 const nStartPos;
+ sal_Int32 const nEndPos;
TEWritingDirectionInfo( bool LeftToRight, sal_Int32 Start, sal_Int32 End )
: bLeftToRight {LeftToRight}
, nStartPos {Start}
@@ -170,7 +170,7 @@ inline bool TextLine::operator == ( const TextLine& rLine ) const
class TEParaPortion
{
private:
- TextNode* mpNode;
+ TextNode* const mpNode;
std::vector<TextLine> maLines;
TETextPortionList maTextPortions;
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 729a130ad456..299ae7161e11 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -26,7 +26,7 @@ class TextUndoDelPara : public TextUndo
{
private:
bool mbDelObject;
- sal_uInt32 mnPara;
+ sal_uInt32 const mnPara;
TextNode* mpNode; // points at the valid not-destroyed object
public:
@@ -42,8 +42,8 @@ public:
class TextUndoConnectParas : public TextUndo
{
private:
- sal_uInt32 mnPara;
- sal_Int32 mnSepPos;
+ sal_uInt32 const mnPara;
+ sal_Int32 const mnSepPos;
public:
TextUndoConnectParas( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos );
@@ -58,8 +58,8 @@ public:
class TextUndoSplitPara : public TextUndo
{
private:
- sal_uInt32 mnPara;
- sal_Int32 mnSepPos;
+ sal_uInt32 const mnPara;
+ sal_Int32 const mnSepPos;
public:
TextUndoSplitPara( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos );
@@ -91,8 +91,8 @@ public:
class TextUndoRemoveChars : public TextUndo
{
private:
- TextPaM maTextPaM;
- OUString maText;
+ TextPaM const maTextPaM;
+ OUString const maText;
public:
TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr );
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 7e51364da608..7aa82f10031b 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -908,8 +908,8 @@ struct ImpFilterLibCacheEntry
#ifndef DISABLE_DYNLOADING
osl::Module maLibrary;
#endif
- OUString maFiltername;
- OUString maFormatName;
+ OUString const maFiltername;
+ OUString const maFormatName;
PFilterCall mpfnImport;
ImpFilterLibCacheEntry(const OUString& rPathname, const OUString& rFiltername, const OUString& rFormatName);
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index f1b92475de40..bdf9e64f8c74 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -36,11 +36,11 @@ class GIFLZWDecompressor
sal_uInt8* pBlockBuf;
sal_uLong nInputBitsBuf;
bool bEOIFound;
- sal_uInt8 nDataSize;
+ sal_uInt8 const nDataSize;
sal_uInt8 nBlockBufSize;
sal_uInt8 nBlockBufPos;
- sal_uInt16 nClearCode;
- sal_uInt16 nEOICode;
+ sal_uInt16 const nClearCode;
+ sal_uInt16 const nEOICode;
sal_uInt16 nTableSize;
sal_uInt16 nCodeSize;
sal_uInt16 nOldCode;
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index 9a282a6defe9..7e952968e393 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -47,7 +47,7 @@ class XBMReader : public GraphicReader
pHexTable;
BitmapColor aWhite;
BitmapColor aBlack;
- long nLastPos;
+ long const nLastPos;
long nWidth;
long nHeight;
bool bStatus;
diff --git a/vcl/source/filter/ixpm/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx
index 7dcc340938d8..2b2f71542658 100644
--- a/vcl/source/filter/ixpm/rgbtable.hxx
+++ b/vcl/source/filter/ixpm/rgbtable.hxx
@@ -23,9 +23,9 @@
struct XPMRGBTab
{
const char* name;
- sal_uInt8 red;
- sal_uInt8 green;
- sal_uInt8 blue;
+ sal_uInt8 const red;
+ sal_uInt8 const green;
+ sal_uInt8 const blue;
};
static const XPMRGBTab pRGBTable[] = {
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index c774041ad807..c31d83a4a82f 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -61,7 +61,7 @@ private:
BitmapScopedWriteAccess mpAcc;
Bitmap maMaskBmp;
BitmapScopedWriteAccess mpMaskAcc;
- long mnLastPos;
+ long const mnLastPos;
sal_uLong mnWidth;
sal_uLong mnHeight;
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 4cc823dcca27..6b5991c60ee7 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -59,7 +59,7 @@ private:
};
struct TiffHeader {
- sal_uInt16 byteOrder;
+ sal_uInt16 const byteOrder;
sal_uInt16 tagAlign;
sal_uInt32 offset;
};
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index 420351a092ca..6772e1e3ec30 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -53,9 +53,9 @@ class JPEGReader : public GraphicReader
std::unique_ptr<Bitmap> mpBitmap;
std::unique_ptr<Bitmap> mpIncompleteAlpha;
- long mnLastPos;
+ long const mnLastPos;
long mnLastLines;
- bool mbSetLogSize;
+ bool const mbSetLogSize;
Graphic CreateIntermediateGraphic(long nLines);
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 02a61e32d0d2..a877c30c6352 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1591,7 +1591,7 @@ public:
char* mpPtr;
char maSubsetName[256];
- bool mbPfbSubset;
+ bool const mbPfbSubset;
int mnHexLineCol;
};
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 54dacc25152e..85aef9aa7ea0 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1046,9 +1046,9 @@ static sal_uInt32 getGlyph0(const sal_uInt8* cmap, sal_uInt32, sal_uInt32 c) {
}
typedef struct _subHeader2 {
- sal_uInt16 firstCode;
- sal_uInt16 entryCount;
- sal_uInt16 idDelta;
+ sal_uInt16 const firstCode;
+ sal_uInt16 const entryCount;
+ sal_uInt16 const idDelta;
sal_uInt16 idRangeOffset;
} subHeader2;
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index b1bd43fdf801..29c9ac4bbeab 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -92,9 +92,9 @@ struct SubRun
namespace vcl {
struct Run
{
- int32_t nStart;
- int32_t nEnd;
- UScriptCode nCode;
+ int32_t const nStart;
+ int32_t const nEnd;
+ UScriptCode const nCode;
Run(int32_t nStart_, int32_t nEnd_, UScriptCode nCode_)
: nStart(nStart_)
, nEnd(nEnd_)
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 046f0b888bc4..9aea2f5df27a 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2608,7 +2608,7 @@ namespace
{
private:
ImplMetaReadData& m_rData;
- rtl_TextEncoding m_eOrigCharSet;
+ rtl_TextEncoding const m_eOrigCharSet;
public:
DepthGuard(ImplMetaReadData& rData, SvStream const & rIStm)
: m_rData(rData)
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 482ab0facbd0..8c779743c5a0 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -182,10 +182,10 @@ class ImplVectMap
{
private:
- Scanline mpBuf;
+ Scanline const mpBuf;
Scanline* mpScan;
- long mnWidth;
- long mnHeight;
+ long const mnWidth;
+ long const mnHeight;
public:
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index cd9dbfbc4ac1..371855861015 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -860,8 +860,8 @@ bool PDFExtOutDevData::HasAdequateCompression( const Graphic &rGraphic,
rGraphic.GetGfxLink().GetDataSize();
static const struct {
- sal_Int32 mnQuality;
- sal_Int32 mnRatio;
+ sal_Int32 const mnQuality;
+ sal_Int32 const mnRatio;
} aRatios[] = { // minimum tolerable compression ratios
{ 100, 400 }, { 95, 700 }, { 90, 1000 }, { 85, 1200 },
{ 80, 1500 }, { 75, 1700 }
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 738a7ffd2b98..fd1b4848ec91 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -33,9 +33,9 @@ namespace vcl
{
struct FontIdentifier
{
- sal_IntPtr m_nFontId;
- bool m_bVertical;
- std::type_info* m_typeFontFace;
+ sal_IntPtr const m_nFontId;
+ bool const m_bVertical;
+ std::type_info* const m_typeFontFace;
FontIdentifier( const PhysicalFontFace*, bool bVertical );
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 79c55efbc6a5..3656fe50ceca 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -106,15 +106,15 @@ public:
const char * m_pName; // Name
const char * m_pStyleName; // StyleName
const char * m_pPSName; // PSName
- int m_nAscent;
- int m_nDescent;
- FontFamily m_eFamily; // Family
- rtl_TextEncoding m_eCharSet; // CharSet
- FontPitch m_ePitch; // Pitch
- FontWidth m_eWidthType; // WidthType
- FontWeight m_eWeight; // Weight
- FontItalic m_eItalic; // Italic
- int m_aWidths[256]; // character metrics
+ int const m_nAscent;
+ int const m_nDescent;
+ FontFamily const m_eFamily; // Family
+ rtl_TextEncoding const m_eCharSet; // CharSet
+ FontPitch const m_ePitch; // Pitch
+ FontWidth const m_eWidthType; // WidthType
+ FontWeight const m_eWeight; // Weight
+ FontItalic const m_eItalic; // Italic
+ int const m_aWidths[256]; // character metrics
OString getNameObject() const;
};
@@ -135,9 +135,9 @@ public:
struct PDFPage
{
PDFWriterImpl* m_pWriter;
- double m_nPageWidth; // in inch/72
- double m_nPageHeight; // in inch/72
- PDFWriter::Orientation m_eOrientation;
+ double const m_nPageWidth; // in inch/72
+ double const m_nPageHeight; // in inch/72
+ PDFWriter::Orientation const m_eOrientation;
sal_Int32 m_nPageObject;
std::vector<sal_Int32> m_aStreamObjects;
sal_Int32 m_nStreamLengthObject;
@@ -529,9 +529,9 @@ public:
struct PDFStructureElementKid // for Kids entries
{
- sal_Int32 nObject; // an object number if nMCID is -1,
+ sal_Int32 const nObject; // an object number if nMCID is -1,
// else the page object relevant to MCID
- sal_Int32 nMCID; // an MCID if >= 0
+ sal_Int32 const nMCID; // an MCID if >= 0
explicit PDFStructureElementKid( sal_Int32 nObj ) : nObject( nObj ), nMCID( -1 ) {}
PDFStructureElementKid( sal_Int32 MCID, sal_Int32 nPage ) : nObject( nPage ), nMCID( MCID ) {}
@@ -583,12 +583,12 @@ public:
// helper structure for drawLayout and friends
struct PDFGlyph
{
- Point m_aPos;
+ Point const m_aPos;
const GlyphItem* m_pGlyph;
- sal_Int32 m_nNativeWidth;
- sal_Int32 m_nMappedFontId;
- sal_uInt8 m_nMappedGlyphId;
- int m_nCharPos;
+ sal_Int32 const m_nNativeWidth;
+ sal_Int32 const m_nMappedFontId;
+ sal_uInt8 const m_nMappedGlyphId;
+ int const m_nCharPos;
PDFGlyph( const Point& rPos,
const GlyphItem* pGlyph,
@@ -693,8 +693,8 @@ private:
sal_Int32 m_nNextFID;
PDFFontCache m_aFontCache;
- sal_Int32 m_nInheritedPageWidth; // in inch/72
- sal_Int32 m_nInheritedPageHeight; // in inch/72
+ sal_Int32 const m_nInheritedPageWidth; // in inch/72
+ sal_Int32 const m_nInheritedPageHeight; // in inch/72
sal_Int32 m_nCurrentPage;
sal_Int32 m_nCatalogObject;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 0d2baba291de..5ad75f843302 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1684,9 +1684,9 @@ void PDFWriterImpl::putG4Bits( sal_uInt32 i_nLength, sal_uInt32 i_nCode, BitStre
struct PixelCode
{
- sal_uInt32 mnEncodedPixels;
- sal_uInt32 mnCodeBits;
- sal_uInt32 mnCode;
+ sal_uInt32 const mnEncodedPixels;
+ sal_uInt32 const mnCodeBits;
+ sal_uInt32 const mnCode;
};
static const PixelCode WhitePixelCodes[] =
@@ -1958,8 +1958,8 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess const * i_pBitmap )
{ // vertical coding
static const struct
{
- sal_uInt32 mnCodeBits;
- sal_uInt32 mnCode;
+ sal_uInt32 const mnCodeBits;
+ sal_uInt32 const mnCode;
} VerticalCodes[7] = {
{ 7, 0x03 }, // 0000 011
{ 6, 0x03 }, // 0000 11
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index befdfcf4bba6..b1c1e28b8384 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -136,7 +136,7 @@ private:
bool mbIDATComplete : 1; // true if finished with enough IDAT chunks
bool mbpHYs : 1; // true if physical size of pixel available
bool mbIgnoreGammaChunk : 1;
- bool mbIgnoreCRC : 1; // skip checking CRCs while fuzzing
+ bool const mbIgnoreCRC : 1; // skip checking CRCs while fuzzing
#if OSL_DEBUG_LEVEL > 0
// do some checks in debug mode
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 4a7da7d9e7d3..86511e325c9f 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -263,7 +263,7 @@ static OUString queryFile( Printer const * pPrinter )
struct PrintJobAsync
{
std::shared_ptr<PrinterController> mxController;
- JobSetup maInitSetup;
+ JobSetup const maInitSetup;
PrintJobAsync(const std::shared_ptr<PrinterController>& i_xController,
const JobSetup& i_rInitSetup)
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index d0b9947aeb30..6631afed284b 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -93,7 +93,7 @@ namespace vcl
OutputDevice& m_rTargetDevice;
OutputDevice& m_rReferenceDevice;
- Font m_aUnzoomedPointFont;
+ Font const m_aUnzoomedPointFont;
const bool m_bRTLEnabled;
tools::Rectangle m_aCompleteTextRect;
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index be83c89d0312..7710708fc6fe 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -295,7 +295,7 @@ void lclImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, GraphicAdju
struct GrfSimpleCacheObj
{
Graphic maGraphic;
- GraphicAttr maAttr;
+ GraphicAttr const maAttr;
GrfSimpleCacheObj( const Graphic& rGraphic, const GraphicAttr& rAttr ) :
maGraphic( rGraphic ), maAttr( rAttr ) {}
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 6fb97894df45..0ae68ec86c13 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -586,7 +586,7 @@ BitmapEx OpenGLHelper::ConvertBGRABufferToBitmapEx(const sal_uInt8* const pBuffe
const char* OpenGLHelper::GLErrorString(GLenum errorCode)
{
static const struct {
- GLenum code;
+ GLenum const code;
const char *string;
} errors[]=
{
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index f95a67747e25..54368cf3fab3 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -56,8 +56,8 @@ namespace {
class ExecuteWrapper
{
- std::function<void()> mFunc;
- Link<Timer*, void> mHandler;
+ std::function<void()> const mFunc;
+ Link<Timer*, void> const mHandler;
volatile bool mbSignal;
public:
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 25cf8693c867..01459201dcdc 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -139,7 +139,7 @@ void DebugEventInjector::InjectTextEvent()
{
struct {
sal_uInt16 nCodeStart, nCodeEnd;
- char aCharStart;
+ char const aCharStart;
} nTextCodes[] = {
{ KEY_0, KEY_9, '0' },
{ KEY_A, KEY_Z, 'a' }
@@ -192,8 +192,8 @@ void DebugEventInjector::InjectKeyNavEdit()
vcl::Window *pWindow = ChooseWindow();
struct {
- double mnProb;
- sal_uInt16 mnKey;
+ double const mnProb;
+ sal_uInt16 const mnKey;
} const nWeights[] = {
// edit / escape etc. - 50%
{ 0.20, KEY_SPACE },
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 54465d6ec316..795a6f98c0fa 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -42,7 +42,7 @@ class ImplDockFloatWin2 : public FloatingWindow
{
private:
ImplDockingWindowWrapper* mpDockWin;
- sal_uInt64 mnLastTicks;
+ sal_uInt64 const mnLastTicks;
Timer m_aDockTimer;
Timer m_aEndDockTimer;
Point maDockPos;
@@ -407,7 +407,7 @@ tools::Rectangle DockingManager::GetPosSizePixel( const vcl::Window *pWindow )
class ImplPopupFloatWin : public FloatingWindow
{
private:
- bool mbToolBox;
+ bool const mbToolBox;
public:
ImplPopupFloatWin( vcl::Window* pParent, bool bToolBox );
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index dadacee4cecb..9a2419c88ec7 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -55,7 +55,7 @@ class ImplDockFloatWin : public FloatingWindow
{
private:
VclPtr<DockingWindow> mpDockWin;
- sal_uInt64 mnLastTicks;
+ sal_uInt64 const mnLastTicks;
Idle maDockIdle;
Point maDockPos;
tools::Rectangle maDockRect;
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index ec001e0a2b30..c9dd1590aa38 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -225,7 +225,7 @@ private:
static std::unique_ptr<ErrorInfo> GetDynamicErrorInfo(ErrCode nId);
ErrCode nErrId;
- DialogMask nMask;
+ DialogMask const nMask;
};
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index abaec7ce72a4..fd45676424a7 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -825,8 +825,8 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
struct ButtonOrder
{
- OString m_aType;
- int m_nPriority;
+ OString const m_aType;
+ int const m_nPriority;
};
static int getButtonPriority(const OString &rType)
@@ -874,7 +874,7 @@ static int getButtonPriority(const OString &rType)
class sortButtons
{
- bool m_bVerticalContainer;
+ bool const m_bVerticalContainer;
public:
explicit sortButtons(bool bVerticalContainer)
: m_bVerticalContainer(bVerticalContainer)
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 5b9c3bb4ea6c..89d1953de607 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -54,7 +54,7 @@ struct MenuItemData
bool bIsTemporary; // Temporary inserted ('No selection possible')
bool bHiddenOnGUI;
Size aSz; // only temporarily valid
- OUString aAccessibleName; // accessible name
+ OUString const aAccessibleName; // accessible name
std::unique_ptr<SalMenuItem> pSalMenuItem; // access to native menu
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 70c0f6f528a8..36433f2ba5b6 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -164,7 +164,7 @@ private:
tools::Rectangle m_aSelectionRect;
tools::Rectangle m_aPaintRect;
vcl::Region m_aPaintRegion;
- ImplPaintFlags m_nPaintFlags;
+ ImplPaintFlags const m_nPaintFlags;
bool m_bPop : 1;
bool m_bRestoreCursor : 1;
bool m_bStartedBufferedPaint : 1; ///< This PaintHelper started a buffered paint, and should paint it on the screen when being destructed.
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 2becf4a6914a..ff2d63626b65 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1312,7 +1312,7 @@ class HandleGestureEventBase
protected:
ImplSVData* m_pSVData;
VclPtr<vcl::Window> m_pWindow;
- Point m_aMousePos;
+ Point const m_aMousePos;
public:
HandleGestureEventBase(vcl::Window *pWindow, const Point &rMousePos)
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index e39af7c63547..8e5788275263 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -41,7 +41,7 @@ namespace vcl_sal {
struct KeysymNameReplacement
{
- KeySym aSymbol;
+ KeySym const aSymbol;
const char* pName;
};
@@ -49,7 +49,7 @@ namespace vcl_sal {
{
const char* pLangName;
const KeysymNameReplacement* pReplacements;
- int nReplacements;
+ int const nReplacements;
};
// CAUTION CAUTION CAUTION
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 9d87117db531..bd2b9d080611 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -156,9 +156,9 @@ extern "C" srv_vendor_t
sal_GetServerVendor( Display *p_display )
{
typedef struct {
- srv_vendor_t e_vendor; // vendor as enum
+ srv_vendor_t const e_vendor; // vendor as enum
const char *p_name; // vendor name as returned by VendorString()
- unsigned int n_len; // number of chars to compare
+ unsigned int const n_len; // number of chars to compare
} vendor_t;
const vendor_t p_vendorlist[] = {
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index beee3216bb51..061bc32f6f59 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -43,7 +43,7 @@ namespace x11 {
rtl::Reference<SelectionManager> m_xSelectionManager;
::std::vector< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
- Atom m_aSelection;
+ Atom const m_aSelection;
X11Clipboard( SelectionManager& rManager, Atom aSelection );
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index 276a21fe765f..2be3c99fe77c 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -36,7 +36,7 @@ namespace x11 {
class DropTargetDropContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDropContext>
{
- ::Window m_aDropWindow;
+ ::Window const m_aDropWindow;
rtl::Reference<SelectionManager> m_xManager;
public:
DropTargetDropContext( ::Window, SelectionManager& );
@@ -51,7 +51,7 @@ namespace x11 {
class DropTargetDragContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDragContext>
{
- ::Window m_aDropWindow;
+ ::Window const m_aDropWindow;
rtl::Reference<SelectionManager> m_xManager;
public:
DropTargetDragContext( ::Window, SelectionManager& );
@@ -65,7 +65,7 @@ namespace x11 {
class DragSourceContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDragSourceContext>
{
- ::Window m_aDropWindow;
+ ::Window const m_aDropWindow;
rtl::Reference<SelectionManager> m_xManager;
public:
DragSourceContext( ::Window, SelectionManager& );
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 5e1c1b3754be..38a2822e049a 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -113,7 +113,7 @@ struct NativeTypeEntry
Atom nAtom;
const char* pType; // Mime encoding on our side
const char* pNativeType; // string corresponding to nAtom for the case of nAtom being uninitialized
- int nFormat; // the corresponding format
+ int const nFormat; // the corresponding format
};
// the convention for Xdnd is mime types as specified by the corresponding
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index 5c4c77824521..f2a5b67b665c 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -31,7 +31,7 @@ namespace x11 {
class X11Transferable : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable >
{
SelectionManager& m_rManager;
- Atom m_aSelection;
+ Atom const m_aSelection;
public:
X11Transferable( SelectionManager& rManager, Atom selection );
virtual ~X11Transferable() override;
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 336bb815e3d2..b2e3862cefdb 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -858,8 +858,8 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily )
{
typedef struct {
const char* mpName;
- sal_uInt16 mnLength;
- FontFamily meType;
+ sal_uInt16 const mnLength;
+ FontFamily const meType;
} family_t;
#define InitializeClass( p, a ) p, sizeof(p) - 1, a
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 2c5261fb75b2..edac964b8336 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -39,8 +39,8 @@ namespace cairo {
explicit X11SysData( const SystemEnvData& );
void* pDisplay; // the relevant display connection
- long hDrawable; // a drawable
- void* pVisual; // the visual in use
+ long const hDrawable; // a drawable
+ void* const pVisual; // the visual in use
int nScreen; // the current screen of the drawable
void* pRenderFormat; // render format for drawable
};
@@ -48,8 +48,8 @@ namespace cairo {
/// RAII wrapper for a pixmap
struct X11Pixmap
{
- void* mpDisplay; // the relevant display connection
- long mhDrawable; // a drawable
+ void* const mpDisplay; // the relevant display connection
+ long const mhDrawable; // a drawable
X11Pixmap( long hDrawable, void* pDisplay ) :
mpDisplay(pDisplay),
@@ -64,8 +64,8 @@ namespace cairo {
class X11Surface : public Surface
{
const X11SysData maSysData;
- X11PixmapSharedPtr mpPixmap;
- CairoSurfaceSharedPtr mpSurface;
+ X11PixmapSharedPtr const mpPixmap;
+ CairoSurfaceSharedPtr const mpSurface;
X11Surface( const X11SysData& rSysData, const X11PixmapSharedPtr& rPixmap, const CairoSurfaceSharedPtr& pSurface );
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 785292223489..492924889595 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -38,7 +38,7 @@ private:
XRenderPeer();
void InitRenderLib();
- Display* mpDisplay;
+ Display* const mpDisplay;
XRenderPictFormat* mpStandardFormatA8;
public:
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 6fb0c7e8b21d..4a65c2b4b6b4 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -756,7 +756,7 @@ private:
mpFlagAry;
FT_Vector maPosition;
- sal_uInt16 mnMaxPoints;
+ sal_uInt16 const mnMaxPoints;
sal_uInt16 mnPoints;
sal_uInt16 mnPoly;
bool bHasOffline;
diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx
index b11b8a728f95..b34bdfd511d9 100644
--- a/vcl/unx/generic/print/bitmap_gfx.cxx
+++ b/vcl/unx/generic/print/bitmap_gfx.cxx
@@ -61,7 +61,7 @@ class HexEncoder : public ByteEncoder
{
private:
- osl::File* mpFile;
+ osl::File* const mpFile;
sal_uInt32 mnColumn;
sal_uInt32 mnOffset;
sal_Char mpFileBuffer[nBufferSize + 16];
@@ -127,7 +127,7 @@ class Ascii85Encoder : public ByteEncoder
{
private:
- osl::File* mpFile;
+ osl::File* const mpFile;
sal_uInt32 mnByte;
sal_uInt8 mpByteBuffer[4];
@@ -277,9 +277,9 @@ private:
std::array<LZWCTreeNode, 4096>
mpTable; // LZW compression data
LZWCTreeNode* mpPrefix; // the compression is as same as the TIFF compression
- sal_uInt16 mnDataSize;
- sal_uInt16 mnClearCode;
- sal_uInt16 mnEOICode;
+ sal_uInt16 const mnDataSize;
+ sal_uInt16 const mnClearCode;
+ sal_uInt16 const mnEOICode;
sal_uInt16 mnTableSize;
sal_uInt16 mnCodeSize;
sal_uInt32 mnOffset;
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 19d38d65341d..8ccbfafb75a0 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -976,8 +976,8 @@ struct PDFNewJobParameters
struct PDFPrintFile
{
- OUString maTmpURL;
- PDFNewJobParameters maParameters;
+ OUString const maTmpURL;
+ PDFNewJobParameters const maParameters;
PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters )
: maTmpURL( i_rURL )
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 3a8f951ea03a..f74ecffdb990 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -521,7 +521,7 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert)
class ImplPspFontData : public FreetypeFontFace
{
private:
- sal_IntPtr mnFontId;
+ sal_IntPtr const mnFontId;
public:
explicit ImplPspFontData( const psp::FastPrintFontInfo& );
diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 7c058dd3fc16..52f7052bd710 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -40,8 +40,8 @@ class GlyphSet
{
private:
- sal_Int32 mnFontID;
- bool mbVertical;
+ sal_Int32 const mnFontID;
+ bool const mbVertical;
OString maBaseName;
typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t;
diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
index d9f2f67df911..0685f80aa2b9 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -36,7 +36,7 @@ class RTSDialog : public weld::GenericDialogController
::psp::PrinterInfo m_aJobData;
// some resources
- OUString m_aInvalidString;
+ OUString const m_aInvalidString;
bool m_bDataModified;
// controls
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 127bbf1b3670..8ac756342f37 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -959,8 +959,8 @@ struct SystemCommandParameters
const char* pPrintCommand;
const char* pForeToken;
const char* pAftToken;
- unsigned int nForeTokenCount;
- tokenHandler pHandler;
+ unsigned int const nForeTokenCount;
+ tokenHandler const pHandler;
};
#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index d566f441eee5..348d400cab1d 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
// ---------------------- AtkHyperlink ----------------------
typedef struct {
- AtkHyperlink atk_hyper_link;
+ AtkHyperlink const atk_hyper_link;
uno::Reference< accessibility::XAccessibleHyperlink > xLink;
} HyperLink;
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 5582215b8cb4..018a755fd234 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -1303,7 +1303,7 @@ AtkAttributeSet* attribute_set_prepend_tracked_change_formatchange( AtkAttribute
struct AtkTextAttrMapping
{
const char * name;
- TextPropertyValueFunc toPropertyValue;
+ TextPropertyValueFunc const toPropertyValue;
};
const AtkTextAttrMapping g_TextAttrMap[] =
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index e72275e77466..63a9cc53a118 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -697,8 +697,8 @@ typedef GType (* GetGIfaceType ) (void);
}
const struct {
const char *name;
- GInterfaceInitFunc aInit;
- GetGIfaceType aGetGIfaceType;
+ GInterfaceInitFunc const aInit;
+ GetGIfaceType const aGetGIfaceType;
const uno::Type & (*aGetUnoType) ();
} aTypeTable[] = {
// re-location heaven:
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 381f3c074fdf..ef33397fa48c 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -46,7 +46,7 @@ namespace com { namespace sun { namespace star { namespace accessibility {
struct AtkObjectWrapper
{
- AtkObject aParent;
+ AtkObject const aParent;
AtkObject* mpOrig; //if we're a GtkDrawingArea acting as a custom LibreOffice widget, this is the toolkit default impl
css::uno::Reference<css::accessibility::XAccessible> mpAccessible;
@@ -77,7 +77,7 @@ struct AtkObjectWrapperClass
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list