diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:28:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:00 +0100 |
commit | d3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch) | |
tree | e9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/source/window/brdwin.cxx | |
parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/source/window/brdwin.cxx')
-rw-r--r-- | vcl/source/window/brdwin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index adb0621ab66b..f65e69ec26d7 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -442,7 +442,7 @@ void ImplNoBorderWindowView::DrawWindow(vcl::RenderContext&, sal_uInt16, const P // - ImplSmallBorderWindowView - ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ) : mpBorderWindow(pBorderWindow) - , mpOutDev(NULL) + , mpOutDev(nullptr) , mnWidth(0) , mnHeight(0) , mnLeftBorder(0) @@ -460,7 +460,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei mnHeight = nHeight; mbNWFBorder = false; - vcl::Window *pWin = NULL, *pCtrl = NULL; + vcl::Window *pWin = nullptr, *pCtrl = nullptr; if (mpOutDev->GetOutDevType() == OUTDEV_WINDOW) pWin = static_cast<vcl::Window*>(mpOutDev.get()); @@ -552,7 +552,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei mpBorderWindow->SetBackground(); pCtrl->SetPaintTransparent( true ); - vcl::Window* pCompoundParent = NULL; + vcl::Window* pCompoundParent = nullptr; if( pWin->GetParent() && pWin->GetParent()->IsCompoundControl() ) pCompoundParent = pWin->GetParent(); @@ -805,8 +805,8 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo maFrameData.mnHelpState = DrawButtonFlags::NONE; maFrameData.mbTitleClipped = false; - mpATitleVirDev = NULL; - mpDTitleVirDev = NULL; + mpATitleVirDev = nullptr; + mpDTitleVirDev = nullptr; } ImplStdBorderWindowView::~ImplStdBorderWindowView() @@ -1728,7 +1728,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ) { - ImplInit( pParent, nStyle, nTypeStyle, NULL ); + ImplInit( pParent, nStyle, nTypeStyle, nullptr ); } void ImplBorderWindow::ImplInit( vcl::Window* pParent, @@ -1786,7 +1786,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, SetBackground(); SetTextFillColor(); - mpMenuBarWindow = NULL; + mpMenuBarWindow = nullptr; mnMinWidth = 0; mnMinHeight = 0; mnMaxWidth = SHRT_MAX; @@ -1832,7 +1832,7 @@ ImplBorderWindow::~ImplBorderWindow() void ImplBorderWindow::dispose() { delete mpBorderView; - mpBorderView = NULL; + mpBorderView = nullptr; mpMenuBarWindow.clear(); mpNotebookBarWindow.disposeAndClear(); vcl::Window::dispose(); |