diff options
Diffstat (limited to 'include')
49 files changed, 181 insertions, 181 deletions
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index e9439069e1c0..9b7e6b44a6a3 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -34,7 +34,7 @@ public: AlphaMask(); AlphaMask( const Bitmap& rBitmap ); AlphaMask( const AlphaMask& rAlphaMask ); - AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL ); + AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = nullptr ); virtual ~AlphaMask(); AlphaMask& operator=( const Bitmap& rBitmap ); diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 3aa12f50f725..b690bea60c13 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -130,9 +130,9 @@ public: const Point& rDestPt, const Size& rDestSz, long nExtraData = 0, - OutputDevice* pFirstFrameOutDev = NULL); + OutputDevice* pFirstFrameOutDev = nullptr); - void Stop( OutputDevice* pOutDev = NULL, long nExtraData = 0 ); + void Stop( OutputDevice* pOutDev = nullptr, long nExtraData = 0 ); void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz ) const; @@ -184,7 +184,7 @@ public: bool Filter( BmpFilter eFilter, - const BmpFilterParam* pFilterParam = NULL ); + const BmpFilterParam* pFilterParam = nullptr ); friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation ); friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation ); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 64ff2dca41ec..6e5f5d883768 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -253,7 +253,7 @@ public: Bitmap(); Bitmap( const Bitmap& rBitmap ); - Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL ); + Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = nullptr ); Bitmap( const ResId& rResId ); Bitmap( SalBitmap* pSalBitmap ); virtual ~Bitmap(); @@ -369,7 +369,7 @@ public: */ bool Expand( sal_uLong nDX, sal_uLong nDY, - const Color* pInitColor = NULL ); + const Color* pInitColor = nullptr ); /** Copy a rectangular area from another bitmap @@ -396,12 +396,12 @@ public: bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, - const Bitmap* pBmpSrc = NULL ); + const Bitmap* pBmpSrc = nullptr ); bool CopyPixel_AlphaOptimized( const Rectangle& rRectDst, const Rectangle& rRectSrc, - const Bitmap* pBmpSrc = NULL ); + const Bitmap* pBmpSrc = nullptr ); /** Perform boolean operations with another bitmap @@ -610,7 +610,7 @@ public: const Color* pSearchColors, const Color* rReplaceColors, sal_uLong nColorCount, - sal_uLong* pTols = NULL ); + sal_uLong* pTols = nullptr ); /** Convert the bitmap to a PolyPolygon @@ -655,7 +655,7 @@ public: GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, BmpVectorizeFlags nFlags = BmpVectorizeFlags::Inner, - const Link<long,void>* pProgress = NULL ); + const Link<long,void>* pProgress = nullptr ); /** Change various global color characteristics @@ -712,7 +712,7 @@ public: */ bool Filter( BmpFilter eFilter, - const BmpFilterParam* pFilterParam = NULL ); + const BmpFilterParam* pFilterParam = nullptr ); public: @@ -738,8 +738,8 @@ public: SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold ); SAL_DLLPRIVATE bool ImplMakeMonoDither(); SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales ); - SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor = NULL ); - SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor = NULL ); + SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor = nullptr ); + SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor = nullptr ); SAL_DLLPRIVATE bool ImplConvertGhosted(); SAL_DLLPRIVATE bool ImplDitherMatrix(); SAL_DLLPRIVATE bool ImplDitherFloyd(); @@ -796,7 +796,7 @@ private: inline bool Bitmap::operator!() const { - return( mpImpBmp == NULL ); + return( mpImpBmp == nullptr ); } inline bool Bitmap::operator==( const Bitmap& rBitmap ) const @@ -816,7 +816,7 @@ inline bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const inline bool Bitmap::IsEmpty() const { - return( mpImpBmp == NULL ); + return( mpImpBmp == nullptr ); } inline const MapMode& Bitmap::GetPrefMapMode() const diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 23d8dd94acde..6beb20de879a 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -72,7 +72,7 @@ public: bool IsTransparent() const; TransparentType GetTransparentType() const { return eTransparent; } - Bitmap GetBitmap( const Color* pTransReplaceColor = NULL ) const; + Bitmap GetBitmap( const Color* pTransReplaceColor = nullptr ) const; Bitmap GetMask() const; bool IsAlpha() const; @@ -165,7 +165,7 @@ public: */ bool Expand( sal_uLong nDX, sal_uLong nDY, - const Color* pInitColor = NULL, + const Color* pInitColor = nullptr, bool bExpandTransparent = false ); /** Copy a rectangular area from another bitmap @@ -193,7 +193,7 @@ public: bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, - const BitmapEx* pBmpExSrc = NULL ); + const BitmapEx* pBmpExSrc = nullptr ); /** Fill the entire bitmap with the given color @@ -311,7 +311,7 @@ public: const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, - const sal_uLong* pTols = NULL ); + const sal_uLong* pTols = nullptr ); /** Change various global color characteristics @@ -365,7 +365,7 @@ public: */ bool Filter( BmpFilter eFilter, - const BmpFilterParam* pFilterParam = NULL ); + const BmpFilterParam* pFilterParam = nullptr ); /** Get transparency at given position diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index b877c227ea2a..4e9c44f81578 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -236,7 +236,7 @@ private: // - Inlines - inline bool BitmapInfoAccess::operator!() const { - return mpBuffer == NULL; + return mpBuffer == nullptr; } inline long BitmapInfoAccess::Width() const @@ -337,7 +337,7 @@ inline Scanline BitmapReadAccess::GetBuffer() const { assert(mpBuffer && "Access is not valid!"); - return mpBuffer ? mpBuffer->mpBits : NULL; + return mpBuffer ? mpBuffer->mpBits : nullptr; } inline Scanline BitmapReadAccess::GetScanline(long nY) const diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 580cc74ab201..b844f5896b09 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -455,7 +455,7 @@ public: void disposeBuilder(); static OUString getUIRootDir(); - bool hasBuilder() const { return m_pUIBuilder != NULL; } + bool hasBuilder() const { return m_pUIBuilder != nullptr; } css::uno::Reference<css::frame::XFrame> getFrame() { return m_pUIBuilder->getFrame(); } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 7e3cf2f315e0..cfd32e013b46 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -52,7 +52,7 @@ public: SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( OUString& rText, WinBits nWinStyle, DrawFlags nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize, bool bLayout, sal_uLong nImageSep, DrawFlags nDrawFlags, - DrawTextFlags nTextStyle, Rectangle *pSymbolRect=NULL, bool bAddImageSep = false ); + DrawTextFlags nTextStyle, Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false ); SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle &rFocusRect ); SAL_DLLPRIVATE const Rectangle& ImplGetFocusRect() const; SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign ); diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index 75556ad0971f..bba39cc97ddd 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -392,7 +392,7 @@ private: public: CommandEvent(); CommandEvent( const Point& rMousePos, CommandEventId nCmd, - bool bMEvt = false, const void* pCmdData = NULL ); + bool bMEvt = false, const void* pCmdData = nullptr ); CommandEventId GetCommand() const { return mnCommand; } const Point& GetMousePosPixel() const { return maPos; } @@ -412,7 +412,7 @@ public: inline CommandEvent::CommandEvent() { - mpData = NULL; + mpData = nullptr; mnCommand = CommandEventId::NONE; mbMouseEvent = false; } @@ -431,7 +431,7 @@ inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const if ( mnCommand == CommandEventId::ExtTextInput ) return static_cast<const CommandExtTextInputData*>(mpData); else - return NULL; + return nullptr; } inline const CommandWheelData* CommandEvent::GetWheelData() const @@ -439,7 +439,7 @@ inline const CommandWheelData* CommandEvent::GetWheelData() const if ( mnCommand == CommandEventId::Wheel ) return static_cast<const CommandWheelData*>(mpData); else - return NULL; + return nullptr; } inline const CommandScrollData* CommandEvent::GetAutoScrollData() const @@ -447,7 +447,7 @@ inline const CommandScrollData* CommandEvent::GetAutoScrollData() const if ( mnCommand == CommandEventId::AutoScroll ) return static_cast<const CommandScrollData*>(mpData); else - return NULL; + return nullptr; } inline const CommandModKeyData* CommandEvent::GetModKeyData() const @@ -455,7 +455,7 @@ inline const CommandModKeyData* CommandEvent::GetModKeyData() const if( mnCommand == CommandEventId::ModKeyChange ) return static_cast<const CommandModKeyData*>(mpData); else - return NULL; + return nullptr; } inline const CommandDialogData* CommandEvent::GetDialogData() const @@ -463,7 +463,7 @@ inline const CommandDialogData* CommandEvent::GetDialogData() const if( mnCommand == CommandEventId::ShowDialog ) return static_cast<const CommandDialogData*>(mpData); else - return NULL; + return nullptr; } inline CommandMediaData* CommandEvent::GetMediaData() const @@ -471,7 +471,7 @@ inline CommandMediaData* CommandEvent::GetMediaData() const if( mnCommand == CommandEventId::Media ) return static_cast<CommandMediaData*>(mpData); else - return NULL; + return nullptr; } inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData() const @@ -479,7 +479,7 @@ inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData() if( mnCommand == CommandEventId::SelectionChange ) return static_cast<const CommandSelectionChangeData*>(mpData); else - return NULL; + return nullptr; } inline const CommandSwipeData* CommandEvent::GetSwipeData() const @@ -487,7 +487,7 @@ inline const CommandSwipeData* CommandEvent::GetSwipeData() const if( mnCommand == CommandEventId::Swipe ) return static_cast<const CommandSwipeData*>(mpData); else - return NULL; + return nullptr; } inline const CommandLongPressData* CommandEvent::GetLongPressData() const @@ -495,7 +495,7 @@ inline const CommandLongPressData* CommandEvent::GetLongPressData() const if( mnCommand == CommandEventId::LongPress ) return static_cast<const CommandLongPressData*>(mpData); else - return NULL; + return nullptr; } #endif // INCLUDED_VCL_CMDEVT_HXX diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index e25e514f5c66..d4bbe5ce21dd 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -113,7 +113,7 @@ public: void EndDialog( long nResult = 0 ); - static void EndAllDialogs( vcl::Window* pParent=NULL ); + static void EndAllDialogs( vcl::Window* pParent=nullptr ); void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 3f015be0ca85..da5dc164e739 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -116,8 +116,8 @@ private: SAL_DLLPRIVATE void ImplRepaint(vcl::RenderContext& rRenderContext, const Rectangle& rRectangle, bool bLayout = false); SAL_DLLPRIVATE void ImplInvalidateOrRepaint(); SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); - SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection = 0 ); - SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = 0, bool bIsUserInput = false ); + SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection = nullptr ); + SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = nullptr, bool bIsUserInput = false ); SAL_DLLPRIVATE OUString ImplGetValidString( const OUString& rString ) const; SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const Rectangle& rRectangle, long nXStart, long nXEnd); SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, long nXEnd); @@ -205,7 +205,7 @@ public: virtual bool IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); - virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; } + virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = nullptr; } void SetEchoChar( sal_Unicode c ); sal_Unicode GetEchoChar() const { return mcEchoChar; } diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 153ad9503717..aa9bb1f5fc9e 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -410,7 +410,7 @@ public: NotifyEvent(); NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow, - const void* pEvent = NULL, + const void* pEvent = nullptr, long nRet = 0 ); MouseNotifyEvent GetType() const { return mnEventType; } @@ -426,7 +426,7 @@ inline const KeyEvent* NotifyEvent::GetKeyEvent() const if ( (mnEventType == MouseNotifyEvent::KEYINPUT) || (mnEventType == MouseNotifyEvent::KEYUP) ) return static_cast<const KeyEvent*>(mpData); else - return NULL; + return nullptr; } inline const MouseEvent* NotifyEvent::GetMouseEvent() const @@ -434,7 +434,7 @@ inline const MouseEvent* NotifyEvent::GetMouseEvent() const if ( (mnEventType >= MouseNotifyEvent::MOUSEBUTTONDOWN) && (mnEventType <= MouseNotifyEvent::MOUSEMOVE) ) return static_cast<const MouseEvent*>(mpData); else - return NULL; + return nullptr; } inline const CommandEvent* NotifyEvent::GetCommandEvent() const @@ -442,7 +442,7 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const if ( mnEventType == MouseNotifyEvent::COMMAND ) return static_cast<const CommandEvent*>(mpData); else - return NULL; + return nullptr; } @@ -469,7 +469,7 @@ private: public: explicit DataChangedEvent(); explicit DataChangedEvent( DataChangedEventType nType, - const void* pData = NULL, + const void* pData = nullptr, AllSettingsFlags nFlags = AllSettingsFlags::NONE ); DataChangedEventType GetType() const { return mnType; } @@ -480,7 +480,7 @@ public: inline DataChangedEvent::DataChangedEvent() { - mpData = NULL; + mpData = nullptr; mnFlags = AllSettingsFlags::NONE; mnType = DataChangedEventType::NONE; } @@ -499,7 +499,7 @@ inline const AllSettings* DataChangedEvent::GetOldSettings() const if ( mnType == DataChangedEventType::SETTINGS ) return static_cast<const AllSettings*>(mpData); else - return NULL; + return nullptr; } #endif // INCLUDED_VCL_EVENT_HXX diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 45a7bf6b7b2e..0f855a35b00f 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -50,7 +50,7 @@ private: bool mbDefaultLocale; protected: - SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection* pNewSel = NULL ); + SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection* pNewSel = nullptr ); SAL_DLLPRIVATE bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; } void SetEmptyFieldValueData( bool bValue ) { mbEmptyFieldValue = bValue; } @@ -59,7 +59,7 @@ protected: bool IsDefaultLocale() const { return mbDefaultLocale; } public: - explicit FormatterBase( Edit* pField = NULL ); + explicit FormatterBase( Edit* pField = nullptr ); virtual ~FormatterBase(); const LocaleDataWrapper& GetLocaleDataWrapper() const; @@ -167,7 +167,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE bool ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, OUString& rOutStr ); SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue ); - SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection* pNewSelection = NULL ); + SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection* pNewSelection = nullptr ); public: virtual ~NumericFormatter(); @@ -319,7 +319,7 @@ protected: SAL_DLLPRIVATE bool ImplDateReformat( const OUString& rStr, OUString& rOutStr, const AllSettings& rSettings ); SAL_DLLPRIVATE void ImplSetUserDate( const Date& rNewDate, - Selection* pNewSelection = NULL ); + Selection* pNewSelection = nullptr ); SAL_DLLPRIVATE OUString ImplGetDateAsText( const Date& rDate, const AllSettings& rSettings ) const; SAL_DLLPRIVATE void ImplNewFieldValue( const Date& rDate ); @@ -410,7 +410,7 @@ protected: SAL_DLLPRIVATE bool ImplTimeReformat( const OUString& rStr, OUString& rOutStr ); SAL_DLLPRIVATE void ImplNewFieldValue( const tools::Time& rTime ); - SAL_DLLPRIVATE void ImplSetUserTime( const tools::Time& rNewTime, Selection* pNewSelection = NULL ); + SAL_DLLPRIVATE void ImplSetUserTime( const tools::Time& rNewTime, Selection* pNewSelection = nullptr ); SAL_DLLPRIVATE bool ImplAllowMalformedInput() const; public: diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 6f5c46ecbc39..b3c58309349c 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -135,7 +135,7 @@ public: * - coordinates of actions will be transformed to preferred mapmode * - the returned rectangle is relative to the preferred mapmode of the metafile */ - Rectangle GetBoundRect( OutputDevice& i_rReference, Rectangle* pHairline = 0 ) const; + Rectangle GetBoundRect( OutputDevice& i_rReference, Rectangle* pHairline = nullptr ) const; void Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, @@ -144,7 +144,7 @@ public: void Convert( MtfConversion eConversion ); void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, - sal_uLong nColorCount, sal_uLong* pTols = NULL ); + sal_uLong nColorCount, sal_uLong* pTols = nullptr ); GDIMetaFile GetMonochromeMtf( const Color& rCol ) const; diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index eaf211d62e1e..b9e461761d2c 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -40,7 +40,7 @@ struct ImpBuffer ImpBuffer( sal_uLong nSize ) { mnRefCount = 1UL; - mpBuffer = nSize ? new sal_uInt8[ nSize ] : NULL; + mpBuffer = nSize ? new sal_uInt8[ nSize ] : nullptr; } ImpBuffer( sal_uInt8* pBuf ) { mnRefCount = 1UL; mpBuffer = pBuf; } @@ -170,7 +170,7 @@ public: void SwapOut(); void SwapIn(); - bool IsSwappedOut() const { return( mpSwap != NULL ); } + bool IsSwappedOut() const { return( mpSwap != nullptr ); } public: diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index ebd59dc8c142..d102d4f30d7a 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -134,7 +134,7 @@ public: MapMode GetPrefMapMode() const; void SetPrefMapMode( const MapMode& rPrefMapMode ); - Size GetSizePixel( const OutputDevice* pRefDevice = NULL ) const; + Size GetSizePixel( const OutputDevice* pRefDevice = nullptr ) const; sal_uLong GetSizeBytes() const; @@ -151,8 +151,8 @@ public: const Point& rDestPt, const Size& rDestSize, long nExtraData = 0L, - OutputDevice* pFirstFrameOutDev = NULL ); - void StopAnimation( OutputDevice* pOutputDevice = NULL, + OutputDevice* pFirstFrameOutDev = nullptr ); + void StopAnimation( OutputDevice* pOutputDevice = nullptr, long nExtraData = 0L ); void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink ); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 80f3cdcc6d04..a1d987f7fbe5 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -190,7 +190,7 @@ public: As some formats (Mtf's) do not have a unique header, it makes sense to supply the file name (incl. ext.), so that the format can be derived from the extension */ - GraphicDescriptor( SvStream& rInStream, const OUString* pPath = NULL ); + GraphicDescriptor( SvStream& rInStream, const OUString* pPath = nullptr ); virtual ~GraphicDescriptor(); @@ -231,7 +231,7 @@ class VCL_DLLPUBLIC GraphicFilter private: void ImplInit(); - sal_uLong ImplSetError( sal_uLong nError, const SvStream* pStm = NULL ); + sal_uLong ImplSetError( sal_uLong nError, const SvStream* pStm = nullptr ); sal_uInt16 ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ); DECL_LINK_TYPED( FilterCallback, ConvertData&, bool ); @@ -276,35 +276,35 @@ public: sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = NULL ); + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr ); sal_uInt16 ExportGraphic( const Graphic& rGraphic, const OUString& rPath, SvStream& rOStm, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = NULL ); + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr ); sal_uInt16 CanImportGraphic( const INetURLObject& rPath, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - sal_uInt16 * pDeterminedFormat = NULL); + sal_uInt16 * pDeterminedFormat = nullptr); sal_uInt16 ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - sal_uInt16 * pDeterminedFormat = NULL, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE ); + sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE ); sal_uInt16 CanImportGraphic( const OUString& rPath, SvStream& rStream, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - sal_uInt16 * pDeterminedFormat = NULL); + sal_uInt16 * pDeterminedFormat = nullptr); sal_uInt16 ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rStream, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - sal_uInt16 * pDeterminedFormat = NULL, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE, - WMF_EXTERNALHEADER *pExtHeader = NULL ); + sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE, + WMF_EXTERNALHEADER *pExtHeader = nullptr ); sal_uInt16 ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rStream, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags, css::uno::Sequence< css::beans::PropertyValue >* pFilterData, - WMF_EXTERNALHEADER *pExtHeader = NULL ); + WMF_EXTERNALHEADER *pExtHeader = nullptr ); const FilterErrorEx& GetLastError() const { return *pErrorEx;} void ResetLastError(); @@ -313,8 +313,8 @@ public: static GraphicFilter& GetGraphicFilter(); static int LoadGraphic( const OUString& rPath, const OUString& rFilter, Graphic& rGraphic, - GraphicFilter* pFilter = NULL, - sal_uInt16* pDeterminedFormat = NULL ); + GraphicFilter* pFilter = nullptr, + sal_uInt16* pDeterminedFormat = nullptr ); sal_uInt16 compressAsPNG(const Graphic& rGraphic, SvStream& rOutputStream, sal_uInt32 nCompression = 5); }; diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index 8347e9d9baf7..d746cf45e775 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -29,7 +29,7 @@ protected: Link<Idle *, void> maIdleHdl; // Callback Link public: - Idle( const sal_Char *pDebugName = NULL ); + Idle( const sal_Char *pDebugName = nullptr ); Idle( const Idle& rIdle ); virtual void Start() override; diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index ab1cd2ce9f13..35b30c0d3128 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -85,7 +85,7 @@ public: explicit ImageList( const ResId& rResId ); ImageList( const ::std::vector< OUString >& rNameVector, const OUString& rPrefix, - const Color* pMaskColor = NULL ); + const Color* pMaskColor = nullptr ); ImageList( const ImageList& rImageList ); ~ImageList(); @@ -94,8 +94,8 @@ public: void InsertFromHorizontalBitmap( const ResId& rResId, sal_uInt16 nCount, const Color *pNonAlphaMaskColor, - const Color *pSearchColors = NULL, - const Color *pReplaceColors = NULL, + const Color *pSearchColors = nullptr, + const Color *pReplaceColors = nullptr, sal_uLong nColorCount = 0); BitmapEx GetAsHorizontalStrip() const; sal_uInt16 GetImageCount() const; diff --git a/include/vcl/impdel.hxx b/include/vcl/impdel.hxx index 54159fcaec09..95f373b1dcb9 100644 --- a/include/vcl/impdel.hxx +++ b/include/vcl/impdel.hxx @@ -61,8 +61,8 @@ class DeletionListener if( m_pNotifier ) m_pNotifier->removeDel( this ); } - void deleted() { m_pNotifier = NULL; } - bool isDeleted() const { return (m_pNotifier == NULL); } + void deleted() { m_pNotifier = nullptr; } + bool isDeleted() const { return (m_pNotifier == nullptr); } }; inline void DeletionNotifier::notifyDelete() diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx index c173863721c4..4244fdbaeda7 100644 --- a/include/vcl/jobdata.hxx +++ b/include/vcl/jobdata.hxx @@ -61,7 +61,7 @@ struct VCL_DLLPUBLIC JobData m_nColorDevice( 0 ), m_nPDFDevice( 0 ), m_eOrientation( orientation::Portrait ), - m_pParser( NULL ) {} + m_pParser( nullptr ) {} JobData& operator=(const psp::JobData& rRight); diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index f33daf7fe853..374066e3539c 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -63,7 +63,7 @@ public: sal_uInt16 GetGroup() const { return (nKeyCodeAndModifiers & KEYGROUP_TYPE); } - OUString GetName( vcl::Window* pWindow = NULL ) const; + OUString GetName( vcl::Window* pWindow = nullptr ) const; bool IsFunction() const { return (eFunc != KeyFuncType::DONTKNOW); } diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 994b1e87fdc1..b270a06c115d 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -387,7 +387,7 @@ private: public: VclFrame(vcl::Window *pParent) : VclBin(pParent) - , m_pLabel(NULL) + , m_pLabel(nullptr) { } virtual ~VclFrame(); diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index bd1cc7515655..0b4bdca556bd 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -106,7 +106,7 @@ namespace vcl bool m_bDeleted; DeleteObjectEntry() : - m_pObject( NULL ), + m_pObject( nullptr ), m_bDeleted( false ) {} @@ -133,7 +133,7 @@ namespace vcl typeid(*this).name(), this ); #endif if( s_pOneInstance == this ) // sanity check - s_pOneInstance = NULL; + s_pOneInstance = nullptr; // do the actual work unsigned int nCount = m_aObjects.size(); @@ -169,7 +169,7 @@ namespace vcl */ static void Delete( vcl::Window* i_pObject ) { - if( s_pOneInstance == NULL ) + if( s_pOneInstance == nullptr ) s_pOneInstance = new LazyDeletor(); // is this object already in the list ? diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 6acc9b3a5925..ab59cf4d6f86 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -108,7 +108,7 @@ struct ImplMenuDelData explicit ImplMenuDelData( const Menu* ); ~ImplMenuDelData(); - bool isDeleted() const { return mpMenu == 0; } + bool isDeleted() const { return mpMenu == nullptr; } }; struct MenuLogo @@ -176,7 +176,7 @@ protected: SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, - sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, + sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = nullptr, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const Rectangle& rRect) const; SAL_DLLPRIVATE void ImplSelect(); @@ -277,7 +277,7 @@ public: void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; - void SetUserValue(sal_uInt16 nItemId, sal_uLong nValue, MenuUserDataReleaseFunction aFunc=0); + void SetUserValue(sal_uInt16 nItemId, sal_uLong nValue, MenuUserDataReleaseFunction aFunc=nullptr); sal_uLong GetUserValue(sal_uInt16 nItemId) const; void SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ); @@ -516,7 +516,7 @@ private: protected: SAL_DLLPRIVATE sal_uInt16 ImplExecute( vcl::Window* pWindow, const Rectangle& rRect, FloatWinPopupFlags nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; - SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; + SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = nullptr ) const; public: PopupMenu(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 71c7daf5c93e..476711af78ef 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -1441,7 +1441,7 @@ protected: public: explicit MetaCommentAction( sal_Int32 nValue = 0L ); explicit MetaCommentAction( const MetaCommentAction& rAct ); - explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); + explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0UL ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index a0484fe94f9b..783806d5d7db 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -81,13 +81,13 @@ struct GLWindow char* lookHere; char* deleteThis; - if (extString==NULL) + if (extString==nullptr) { return GL_FALSE; } deleteThis=lookHere=static_cast<char*>(malloc(strlen(reinterpret_cast<const char*>(extString))+1)); - if (lookHere==NULL) + if (lookHere==nullptr) { return GL_FALSE; } @@ -95,14 +95,14 @@ struct GLWindow /* strtok() will modify string, so copy it somewhere */ strcpy(lookHere, reinterpret_cast<const char*>(extString)); - while ((word=strtok(lookHere, " "))!=NULL) + while ((word=strtok(lookHere, " "))!=nullptr) { if (strcmp(word, reinterpret_cast<const char*>(extName))==0) { flag=GL_TRUE; break; } - lookHere=NULL; /* get next token */ + lookHere=nullptr; /* get next token */ } free(static_cast<void*>(deleteThis)); @@ -149,22 +149,22 @@ struct GLWindow #elif defined( ANDROID ) #elif defined( LIBO_HEADLESS ) #elif defined( UNX ) - dpy(NULL), + dpy(nullptr), screen(0), win(0), pix(0), #if defined( GLX_EXT_texture_from_pixmap ) - fbc(0), + fbc(nullptr), #endif - vi(NULL), - ctx(0), + vi(nullptr), + ctx(nullptr), glPix(0), - GLXExtensions(NULL), + GLXExtensions(nullptr), #endif bpp(0), Width(0), Height(0), - GLExtensions(NULL), + GLExtensions(nullptr), bMultiSampleSupported(false) { } @@ -186,7 +186,7 @@ public: void requestLegacyContext(); void requestSingleBufferedRendering(); - bool init(vcl::Window* pParent = 0); + bool init(vcl::Window* pParent = nullptr); bool init(SystemChildWindow* pChildWindow); // these methods are for the deep platform layer, don't use them in normal code diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index f4cbc5f06704..a146c86dc635 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -721,7 +721,7 @@ public: vcl::Region GetClipRegion() const; void SetClipRegion(); void SetClipRegion( const vcl::Region& rRegion ); - bool SelectClipRegion( const vcl::Region&, SalGraphics* pGraphics = NULL ); + bool SelectClipRegion( const vcl::Region&, SalGraphics* pGraphics = nullptr ); bool IsClipRegion() const { return mbClipRegion; } @@ -750,7 +750,7 @@ public: void DrawPixel( const Point& rPt ); void DrawPixel( const Point& rPt, const Color& rColor ); - void DrawPixel( const tools::Polygon& rPts, const Color* pColors = NULL ); + void DrawPixel( const tools::Polygon& rPts, const Color* pColors = nullptr ); void DrawPixel( const tools::Polygon& rPts, const Color& rColor ); Color GetPixel( const Point& rPt ) const; @@ -894,8 +894,8 @@ public: private: - SAL_DLLPRIVATE void ImplDrawPolygon( const tools::Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly = NULL ); - SAL_DLLPRIVATE void ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly = NULL ); + SAL_DLLPRIVATE void ImplDrawPolygon( const tools::Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly = nullptr ); + SAL_DLLPRIVATE void ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly = nullptr ); SAL_DLLPRIVATE void ImplDrawPolyPolygon( sal_uInt16 nPoly, const tools::PolyPolygon& rPolyPoly ); // #i101491# // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon @@ -1017,12 +1017,12 @@ public: void DrawText( const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - MetricVector* pVector = NULL, OUString* pDisplayText = NULL ); + MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr ); void DrawText( const Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::NONE, - MetricVector* pVector = NULL, OUString* pDisplayText = NULL, - vcl::ITextLayout* _pTextLayout = NULL ); + MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr, + vcl::ITextLayout* _pTextLayout = nullptr ); static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const OUString& rOrigStr, DrawTextFlags nStyle, @@ -1034,7 +1034,7 @@ public: void DrawCtrlText( const Point& rPos, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - DrawTextFlags nStyle = DrawTextFlags::Mnemonic, MetricVector* pVector = NULL, OUString* pDisplayText = NULL ); + DrawTextFlags nStyle = DrawTextFlags::Mnemonic, MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr ); void DrawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, @@ -1055,8 +1055,8 @@ public: Rectangle GetTextRect( const Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::WordBreak, - TextRectInfo* pInfo = NULL, - const vcl::ITextLayout* _pTextLayout = NULL ) const; + TextRectInfo* pInfo = nullptr, + const vcl::ITextLayout* _pTextLayout = nullptr ) const; /** Return the exact bounding rectangle of rStr. @@ -1109,24 +1109,24 @@ public: */ bool GetTextBoundRect( Rectangle& rRect, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; Rectangle ImplGetTextBoundRect( const SalLayout& ); bool GetTextOutline( tools::PolyPolygon&, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, bool bOptimize = true, - sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; bool GetTextOutlines( PolyPolyVector&, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, bool bOptimize = true, - sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; bool GetTextOutlines( ::basegfx::B2DPolyPolygonVector &rVector, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, bool bOptimize = true, - sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const; + sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; OUString GetEllipsisString( const OUString& rStr, long nMaxWidth, @@ -1190,17 +1190,17 @@ public: float approximate_char_width() const; void DrawTextArray( const Point& rStartPt, const OUString& rStr, - const long* pDXAry = NULL, + const long* pDXAry = nullptr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, SalLayoutFlags flags = SalLayoutFlags::NONE); - long GetTextArray( const OUString& rStr, long* pDXAry = NULL, + long GetTextArray( const OUString& rStr, long* pDXAry = nullptr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr) const; bool GetCaretPositions( const OUString&, long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, - long* pDXAry = NULL, long nWidth = 0, + long* pDXAry = nullptr, long nWidth = 0, bool bCellBreaking = true ) const; void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const OUString& rStr, @@ -1306,7 +1306,7 @@ public: static vcl::Font GetDefaultFont( DefaultFontType nType, LanguageType eLang, GetDefaultFontFlags nFlags, - const OutputDevice* pOutDev = NULL ); + const OutputDevice* pOutDev = nullptr ); SAL_DLLPRIVATE void ImplInitFontList() const; SAL_DLLPRIVATE void ImplUpdateFontData( bool bNewFontLists ); @@ -1355,7 +1355,7 @@ public: SystemTextLayoutData GetSysTextLayoutData( const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - const long* pDXAry = NULL ) const; + const long* pDXAry = nullptr ) const; SAL_DLLPRIVATE bool ImplIsAntiparallel() const ; SAL_DLLPRIVATE void ReMirror( Point &rPoint ) const; @@ -1365,7 +1365,7 @@ public: virtual bool HasMirroredGraphics() const; SAL_DLLPRIVATE SalLayout* ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen, const Point& rLogicPos = Point(0,0), long nLogicWidth=0, - const long* pLogicDXArray=NULL, SalLayoutFlags flags = SalLayoutFlags::NONE, + const long* pLogicDXArray=nullptr, SalLayoutFlags flags = SalLayoutFlags::NONE, vcl::TextLayoutCache const* = nullptr) const; SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen, DeviceCoordinate nPixelWidth, const DeviceCoordinate* pPixelDXArray, @@ -2033,7 +2033,7 @@ public: that's too much for now, wrote \#i107046# for this */ bool DrawEPS( const Point& rPt, const Size& rSz, - const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL ); + const GfxLink& rGfxLink, GDIMetaFile* pSubst = nullptr ); ///@} }; diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index f6ed9a322b46..c10f1cc3622e 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -664,7 +664,7 @@ The following structure describes the permissions used in PDF security DPIx( 0 ), DPIy( 0 ), ColorMode( PDFWriter::DrawColor ), - SignCertificate( 0 ) + SignCertificate( nullptr ) {} }; @@ -709,7 +709,7 @@ The following structure describes the permissions used in PDF security {} }; - void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = NULL ); + void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr ); /* sets the document locale originally passed with the context to a new value * only affects the output if used before calling Emit. diff --git a/include/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx index bb32b2e0173c..a5b65532c132 100644 --- a/include/vcl/pngwrite.hxx +++ b/include/vcl/pngwrite.hxx @@ -36,7 +36,7 @@ namespace vcl public: - explicit PNGWriter(const BitmapEx&, const css::uno::Sequence<css::beans::PropertyValue>* pFilterData = NULL); + explicit PNGWriter(const BitmapEx&, const css::uno::Sequence<css::beans::PropertyValue>* pFilterData = nullptr); ~PNGWriter(); bool Write(SvStream& rStream); diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 37cd2989375a..37165181fbb7 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -138,7 +138,7 @@ public: const PPDKey* m_pKey2; const PPDValue* m_pOption2; - PPDConstraint() : m_pKey1( NULL ), m_pOption1( NULL ), m_pKey2( NULL ), m_pOption2( NULL ) {} + PPDConstraint() : m_pKey1( nullptr ), m_pOption1( nullptr ), m_pKey2( nullptr ), m_pOption2( nullptr ) {} }; private: hash_type m_aKeys; @@ -258,7 +258,7 @@ class VCL_DLLPUBLIC PPDContext bool checkConstraints( const PPDKey*, const PPDValue*, bool bDoReset ); bool resetValue( const PPDKey*, bool bDefaultable = false ); public: - PPDContext( const PPDParser* pParser = NULL ); + PPDContext( const PPDParser* pParser = nullptr ); PPDContext( const PPDContext& rContext ) { operator=( rContext ); } PPDContext& operator=( const PPDContext& rContext ); ~PPDContext(); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 4ee1b94399db..11a4974e5497 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -305,7 +305,7 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( vcl::Window* pWindow = NULL, bool bPapersizeFromSetup = false ); + bool Setup( vcl::Window* pWindow = nullptr, bool bPapersizeFromSetup = false ); bool SetPrinterProps( const Printer* pPrinter ); // SetPrinterOptions is used internally only now @@ -572,7 +572,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper * if the optional output set is not NULL then the names of the changed properties are returned **/ bool processProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp, - std::set< OUString >* o_pChangeProp = NULL ); + std::set< OUString >* o_pChangeProp = nullptr ); /* append to a sequence of property values the ui property sequence passed at creation * as the "ExtraPrintUIOptions" property. if that sequence was empty, no "ExtraPrintUIOptions" property * will be appended. @@ -634,7 +634,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper const OUString& i_rTitle, const css::uno::Sequence< OUString >& i_rHelpId, const OUString& i_rType, - const css::beans::PropertyValue* i_pValue = NULL, + const css::beans::PropertyValue* i_pValue = nullptr, const UIControlOptions& i_rControlOptions = UIControlOptions() ); diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 9f2dd656c497..6037bdcfb1dc 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -289,7 +289,7 @@ BitmapAccessMode; // - StretchAndConvert - VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, - sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = NULL, const ColorMask* pDstMask = NULL ); + sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = nullptr, const ColorMask* pDstMask = nullptr ); inline BitmapColor::BitmapColor() : mcBlueOrIndex ( 0 ), @@ -442,7 +442,7 @@ inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) } inline BitmapPalette::BitmapPalette() : - mpBitmapColor ( NULL ), + mpBitmapColor ( nullptr ), mnCount ( 0 ) { } @@ -457,7 +457,7 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } else - mpBitmapColor = NULL; + mpBitmapColor = nullptr; } inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : @@ -470,7 +470,7 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : memset( mpBitmapColor, 0, nSize ); } else - mpBitmapColor = NULL; + mpBitmapColor = nullptr; } inline BitmapPalette::~BitmapPalette() @@ -490,7 +490,7 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } else - mpBitmapColor = NULL; + mpBitmapColor = nullptr; return *this; } @@ -536,7 +536,7 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount ) if( !nCount ) { delete[] reinterpret_cast<sal_uInt8*>(mpBitmapColor); - mpBitmapColor = NULL; + mpBitmapColor = nullptr; mnCount = 0; } else if( nCount != mnCount ) diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index a197cbc3ef80..d88115b8f5b8 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -72,7 +72,7 @@ protected: virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const = 0; public: - Scheduler( const sal_Char *pDebugName = NULL ); + Scheduler( const sal_Char *pDebugName = nullptr ); Scheduler( const Scheduler& rScheduler ); virtual ~Scheduler(); diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 33442becb30b..aa0c256d20b6 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -98,7 +98,7 @@ private: public: SelectionEngine( vcl::Window* pWindow, - FunctionSet* pFunctions = NULL, + FunctionSet* pFunctions = nullptr, sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); ~SelectionEngine(); diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 14bc46b57cf9..7f4bc6f04517 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -31,7 +31,7 @@ namespace vcl { class Window; } class VCL_DLLPUBLIC Sound { public: - static void Beep( vcl::Window* pWindow = NULL ); + static void Beep( vcl::Window* pWindow = nullptr ); }; #endif // INCLUDED_VCL_SOUND_HXX diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index f1e96a6651a7..ceeb007c62e1 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -85,7 +85,7 @@ public: void StartDrag(); void SetDragRectPixel( const Rectangle& rDragRect, - vcl::Window* pRefWin = NULL ); + vcl::Window* pRefWin = nullptr ); void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index c51f925bd727..a129c3f53478 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -854,7 +854,7 @@ public: @return the event ID used to post the event. */ - static ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = NULL, + static ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = nullptr, bool bReferenceLink = false ); /** Remove user event based on event ID @@ -1185,7 +1185,7 @@ public: @see GetHelp */ - static void SetHelp( Help* pHelp = NULL ); + static void SetHelp( Help* pHelp = nullptr ); /** Gets the application's help diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 57217df2fb57..226db49b6169 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -84,17 +84,17 @@ struct SystemEnvData #elif defined( ANDROID ) #elif defined( IOS ) #elif defined( UNX ) - , pDisplay(NULL) + , pDisplay(nullptr) , aWindow(0) - , pSalFrame(NULL) - , pWidget(NULL) - , pVisual(NULL) + , pSalFrame(nullptr) + , pWidget(nullptr) + , pVisual(nullptr) , nScreen(0) , nDepth(0) , aColormap(0) - , pAppContext(NULL) + , pAppContext(nullptr) , aShellWindow(0) - , pShellWidget(NULL) + , pShellWidget(nullptr) #endif { } @@ -167,13 +167,13 @@ struct SystemGraphicsData #elif defined( IOS ) , rCGContext( NULL ) #elif defined( UNX ) - , pDisplay( NULL ) + , pDisplay( nullptr ) , hDrawable( 0 ) - , pVisual( NULL ) + , pVisual( nullptr ) , nScreen( 0 ) , nDepth( 0 ) , aColormap( 0 ) - , pXRenderFormat( NULL ) + , pXRenderFormat( nullptr ) #endif { } }; @@ -219,7 +219,7 @@ struct SystemFontData SystemFontData() : nSize( sizeof( SystemFontData ) ) #if defined( UNX ) - , nFontId( NULL ) + , nFontId( nullptr ) , nFontFlags( 0 ) #endif , bFakeBold( false ) diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index dd1752b673fc..3def95a603f2 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -151,7 +151,7 @@ protected: TextPaM ImpInsertText( const TextSelection& rSel, const OUString& rText ); TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, bool bKeepEndingAttribs = true ); TextPaM ImpInsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs = true ); - void ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars, SfxUndoAction* pCurUndo = 0 ); + void ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars, SfxUndoAction* pCurUndo = nullptr ); TextPaM ImpConnectParagraphs( sal_uInt32 nLeft, sal_uInt32 nRight ); void ImpRemoveParagraph( sal_uInt32 nPara ); void ImpInitWritingDirections( sal_uInt32 nPara ); @@ -176,7 +176,7 @@ protected: DECL_LINK_TYPED( IdleFormatHdl, Idle *, void ); void CheckIdleFormatter(); - void IdleFormatAndUpdate( TextView* pCurView = 0, sal_uInt16 nMaxTimerRestarts = 5 ); + void IdleFormatAndUpdate( TextView* pCurView = nullptr, sal_uInt16 nMaxTimerRestarts = 5 ); bool CreateLines( sal_uInt32 nPara ); void CreateAndInsertEmptyLine( sal_uInt32 nPara ); @@ -188,11 +188,11 @@ protected: void FormatDoc(); void FormatFullDoc(); - void FormatAndUpdate( TextView* pCurView = 0 ); + void FormatAndUpdate( TextView* pCurView = nullptr ); bool IsFormatting() const { return mbIsFormatting; } - void UpdateViews( TextView* pCurView = 0 ); + void UpdateViews( TextView* pCurView = nullptr ); - void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); + void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = nullptr, TextSelection const* pSelection = nullptr ); bool IsFormatted() const { return mbFormatted; } @@ -202,14 +202,14 @@ protected: long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine* pLine, sal_uInt16 nTextPortion ); long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false ); long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 ); - sal_uInt8 ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32* pStart = NULL, sal_Int32* pEnd = NULL ); + sal_uInt8 ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32* pStart = nullptr, sal_Int32* pEnd = nullptr ); static void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false ); TxtAlign ImpGetAlign() const; long CalcTextHeight(); long CalcParaHeight( sal_uInt32 nParagraph ) const; long CalcTextWidth( sal_uInt32 nPara ); - long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen, const vcl::Font* pFont = 0 ); + long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen, const vcl::Font* pFont = nullptr ); Range GetInvalidYOffsets( sal_uInt32 nPortion ); // for Undo/Redo @@ -286,13 +286,13 @@ public: void SetModified( bool bModified ) { mbModified = bModified; } bool IsModified() const { return mbModified; } - bool Read( SvStream& rInput, const TextSelection* pSel = NULL ); + bool Read( SvStream& rInput, const TextSelection* pSel = nullptr ); - bool Write( SvStream& rOutput, const TextSelection* pSel = NULL, bool bHTML = false ); + bool Write( SvStream& rOutput, const TextSelection* pSel = nullptr, bool bHTML = false ); TextPaM GetPaM( const Point& rDocPos, bool bSmart = true ); Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); - OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = 0 ); + OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = nullptr ); bool HasAttrib( sal_uInt16 nWhich ) const; const TextAttrib* FindAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 4fa335cca908..44e4ef52d3ae 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -62,13 +62,13 @@ protected: void ShowSelection(); void HideSelection(); void ShowSelection( const TextSelection& rSel ); - void ImpShowHideSelection( bool bShow, const TextSelection* pRange = NULL ); + void ImpShowHideSelection( bool bShow, const TextSelection* pRange = nullptr ); TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent ); TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); bool IsInSelection( const TextPaM& rPaM ); - void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0); + void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = nullptr, TextSelection const* pSelection = nullptr); void ImpPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bUseVirtDev); void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey ); void ImpHighlight( const TextSelection& rSel ); diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index c2aee506758a..8e3fa53231e6 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -45,7 +45,7 @@ namespace vcl virtual ~SolarThreadExecutor(); virtual long doIt() = 0; - long execute() { return impl_execute( NULL ); } + long execute() { return impl_execute( nullptr ); } private: long impl_execute( const TimeValue* _pTimeout ); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 5976db92276f..94a025ecd697 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -35,7 +35,7 @@ protected: virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const override; public: - Timer( const sal_Char *pDebugName = NULL ); + Timer( const sal_Char *pDebugName = nullptr ); Timer( const Timer& rTimer ); /// Make it possible to associate a callback with this timer handler diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index dee1d9825ae6..4883d076e533 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -51,15 +51,15 @@ public: ToolBoxCustomizeEvent(); ToolBoxCustomizeEvent( ToolBox* pDropBox, sal_uInt16 nId, sal_uInt16 nPos = 0, - void* pUserData = NULL ); + void* pUserData = nullptr ); }; inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent() { - mpTargetBox = NULL; + mpTargetBox = nullptr; mnIdFrom = 0; mnPosTo = 0; - mpData = NULL; + mpData = nullptr; } inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent( ToolBox* pDropBox, @@ -233,7 +233,7 @@ private: ToolBox& operator= (const ToolBox &) = delete; public: - SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL ); + SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = nullptr ); SAL_DLLPRIVATE void ImplDisableFlatButtons(); static SAL_DLLPRIVATE int ImplGetDragWidth( ToolBox* pThis ); diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 1b65eb6764aa..5730999701a9 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -215,7 +215,7 @@ private: void* pData; public: - VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = NULL ); + VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = nullptr ); virtual ~VclWindowEvent(); TYPEINFO_OVERRIDE(); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 2d577f7ab05a..de13e6fd91b2 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -73,7 +73,7 @@ public: virtual bool IsModified() const override; virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ) override; - virtual void DisableUpdateData() override { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } + virtual void DisableUpdateData() override { delete pUpdateDataTimer; pUpdateDataTimer = nullptr; } virtual void SetReadOnly( bool bReadOnly = true ) override; virtual bool IsReadOnly() const override; diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 75748b47a67d..b5d99cb3cbc0 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -42,7 +42,7 @@ private: sal_Int8 mnAlphaDepth; sal_uInt8 meRefDevMode; - SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ); + SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData = nullptr ); SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer, const bool bTopDown ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index fd62a8a17f70..67a9aac2afe1 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -567,7 +567,7 @@ public: SAL_DLLPRIVATE vcl::Window* ImplGetWindow(); SAL_DLLPRIVATE ImplWinData* ImplGetWinData() const; SAL_DLLPRIVATE vcl::Window* ImplGetClientWindow() const; - SAL_DLLPRIVATE vcl::Window* ImplGetDlgWindow( sal_uInt16 n, GetDlgWindowType nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); + SAL_DLLPRIVATE vcl::Window* ImplGetDlgWindow( sal_uInt16 n, GetDlgWindowType nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = nullptr ); SAL_DLLPRIVATE vcl::Window* ImplGetParent() const; SAL_DLLPRIVATE vcl::Window* ImplFindWindow( const Point& rFramePos ); @@ -797,7 +797,7 @@ protected: void SetCompoundControl( bool bCompound ); - void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); + void CallEventListeners( sal_uLong nEvent, void* pData = nullptr ); static void FireVclEvent( VclSimpleEvent& rEvent ); virtual bool AcquireGraphics() const override; @@ -882,7 +882,7 @@ public: void AddChildEventListener( const Link<VclWindowEvent&,void>& rEventListener ); void RemoveChildEventListener( const Link<VclWindowEvent&,void>& rEventListener ); - ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = NULL, bool bReferenceLink = false ); + ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = nullptr, bool bReferenceLink = false ); void RemoveUserEvent( ImplSVEvent * nUserEvent ); void IncrementLockCount(); @@ -949,7 +949,7 @@ public: void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; void EndExtTextInput( EndExtTextInputFlags nFlags ); - void SetCursorRect( const Rectangle* pRect = NULL, long nExtTextInputWidth = 0 ); + void SetCursorRect( const Rectangle* pRect = nullptr, long nExtTextInputWidth = 0 ); const Rectangle* GetCursorRect() const; long GetCursorExtTextInputWidth() const; @@ -1018,7 +1018,7 @@ public: void EnableInput( bool bEnable = true, bool bChild = true ); void EnableInput( bool bEnable, bool bChild, bool bSysWin, - const vcl::Window* pExcludeWindow = NULL ); + const vcl::Window* pExcludeWindow = nullptr ); bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people @@ -1248,8 +1248,8 @@ public: void EndAutoScroll(); bool HandleScrollCommand( const CommandEvent& rCmd, - ScrollBar* pHScrl = NULL, - ScrollBar* pVScrl = NULL ); + ScrollBar* pHScrl = nullptr, + ScrollBar* pVScrl = nullptr ); void SaveBackground( const Point& rPos, const Size& rSize, const Point& rDestOff, VirtualDevice& rSaveDevice ); diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx index bd8e9aff6872..f7864edcfa88 100644 --- a/include/vcl/wmf.hxx +++ b/include/vcl/wmf.hxx @@ -55,11 +55,11 @@ struct WMF_EXTERNALHEADER } }; -bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_EXTERNALHEADER *pExtHeader = NULL ); +bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = nullptr, WMF_EXTERNALHEADER *pExtHeader = nullptr ); -VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem = NULL ); +VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem = nullptr ); -VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, bool bPlaceable = true ); +VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = nullptr, bool bPlaceable = true ); bool ConvertGDIMetaFileToEMF(const GDIMetaFile & rMTF, SvStream & rTargetStream); diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index c3fed0ce47e8..0d08b2a2b0b4 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -67,7 +67,7 @@ private: protected: explicit WorkWindow( WindowType nType ); - SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = nullptr ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: |