summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/CommonSalLayout.cxx6
-rw-r--r--vcl/source/gdi/gdimtf.cxx2
-rw-r--r--vcl/source/gdi/impvect.cxx6
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx4
-rw-r--r--vcl/source/gdi/pdffontcache.hxx6
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx42
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx10
-rw-r--r--vcl/source/gdi/pngread.cxx2
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/source/gdi/textlayout.cxx2
10 files changed, 41 insertions, 41 deletions
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;