vcl/quartz/salgdiutils.cxx | 4 ++-- vcl/quartz/utils.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit d6d7beae483ec58e45c0f38fd66dc6c24e996275 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Nov 11 21:07:13 2020 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Nov 12 08:10:18 2020 +0100 loplugin:nullptr (macOS) Change-Id: I94b624f5340709e2cc456be12c7b21eab508dddb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105609 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 57953e536796..645cfe4db765 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -157,14 +157,14 @@ bool AquaSalGraphics::CheckContext() const int nBytesPerRow = (nBitmapDepth * nScaledWidth) / 8; int nFlags = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host; maBGContextHolder.set(CGBitmapContextCreate( - NULL, nScaledWidth, nScaledHeight, 8, nBytesPerRow, GetSalData()->mxRGBSpace, nFlags)); + nullptr, nScaledWidth, nScaledHeight, 8, nBytesPerRow, GetSalData()->mxRGBSpace, nFlags)); maLayer.set(CGLayerCreateWithContext(maBGContextHolder.get(), aLayerSize, nullptr)); maLayer.setScale(fScale); nFlags = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host; maCSContextHolder.set(CGBitmapContextCreate( - NULL, nScaledWidth, nScaledHeight, 8, nBytesPerRow, GetSalData()->mxRGBSpace, nFlags)); + nullptr, nScaledWidth, nScaledHeight, 8, nBytesPerRow, GetSalData()->mxRGBSpace, nFlags)); CGContextRef xDrawContext = CGLayerGetContext(maLayer.get()); maContextHolder = xDrawContext; diff --git a/vcl/quartz/utils.cxx b/vcl/quartz/utils.cxx index 5bb42db9710c..ce5f9e4fa77e 100644 --- a/vcl/quartz/utils.cxx +++ b/vcl/quartz/utils.cxx @@ -207,7 +207,7 @@ std::ostream &operator <<(std::ostream& s, CGColorSpaceRef cs) } CFStringRef name = CGColorSpaceCopyName(cs); - if (name != NULL) + if (name != nullptr) s << " (" << [(NSString *)name UTF8String] << ")"; #endif return s; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
