summaryrefslogtreecommitdiff
path: root/vcl/inc/generic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:28:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:32:00 +0100
commitd3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch)
treee9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/inc/generic
parent45979047abbd9da7a29401f298e8ef9ab58ad337 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/inc/generic')
-rw-r--r--vcl/inc/generic/gendata.hxx2
-rw-r--r--vcl/inc/generic/glyphcache.hxx2
-rw-r--r--vcl/inc/generic/printergfx.hxx6
-rw-r--r--vcl/inc/generic/printerjob.hxx2
4 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 6c3422697238..b2223b5c934f 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -32,7 +32,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
// for transient storage of unicode strings eg. 'u123' by input methods
OUString m_aUnicodeEntry;
public:
- SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; SetSalData( this ); }
+ SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); }
virtual ~SalGenericData() {}
virtual void Dispose() {}
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 61c9bcc76140..a780f88a0c14 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -135,7 +135,7 @@ struct ExtGlyphData
basebmp::Format meInfo;
SvpGcpHelper* mpData;
- ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(NULL) {}
+ ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(nullptr) {}
};
class GlyphData
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 703328304593..e6eec88e53ab 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -278,7 +278,7 @@ public:
void PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries);
void PSShowText (const unsigned char* pString,
sal_Int16 nGlyphs, sal_Int16 nBytes,
- const sal_Int32* pDeltaArray = NULL);
+ const sal_Int32* pDeltaArray = nullptr);
void PSComment (const sal_Char* pComment );
void LicenseWarning (const Point& rPoint, const sal_Unicode* pStr,
sal_Int16 nLen, const sal_Int32* pDeltaArray);
@@ -293,7 +293,7 @@ public:
const sal_Int32* pDeltaArray );
void drawText (const Point& rPoint,
const sal_Unicode* pStr, sal_Int16 nLen,
- const sal_Int32* pDeltaArray = NULL);
+ const sal_Int32* pDeltaArray = nullptr);
void drawGlyphs( const Point& rPoint,
sal_GlyphId* pGlyphIds,
@@ -378,7 +378,7 @@ public:
{ return maVirtualStatus.mbArtBold; }
void DrawText (const Point& rPoint,
const sal_Unicode* pStr, sal_Int16 nLen,
- const sal_Int32* pDeltaArray = NULL);
+ const sal_Int32* pDeltaArray = nullptr);
void SetTextColor (PrinterColor& rTextColor)
{ maTextColor = rTextColor; }
sal_Int32 GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo,
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 39dbc7b5760f..c3738a5c3bef 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -83,7 +83,7 @@ public: // for usage in PrinterGfx
sal_uInt32 GetResolution () const { return mnResolution; }
void GetScale (double &rXScale, double &rYScale) const;
sal_uInt16 GetDepth () const;
- sal_uInt16 GetPostscriptLevel (const JobData *pJobData = NULL) const;
+ sal_uInt16 GetPostscriptLevel (const JobData *pJobData = nullptr) const;
bool IsColorPrinter () const;
osl::File* GetCurrentPageHeader ();