diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 20:16:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 6cf30940750607eeb062113dbee9968769d7bd06 (patch) | |
| tree | 5d30410c5f32f45105d896c065da3fffbd5edf88 /reportdesign | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/FixedTextColor.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 43220434db9e..040cf6b70545 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -176,7 +176,7 @@ namespace rptui if ( pUnoObj ) // this doesn't need to be done for shapes { ::boost::shared_ptr<OSectionWindow> pSectionWindow = pController->getSectionWindow(xSection); - if (pSectionWindow != NULL) + if (pSectionWindow != 0) { OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 0cbe5ffab466..d442b1c427c9 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -177,7 +177,7 @@ namespace rptui if ( pUnoObj ) // this doesn't need to be done for shapes { ::boost::shared_ptr<OSectionWindow> pSectionWindow = m_rReportController.getSectionWindow(xSection); - if (pSectionWindow != NULL) + if (pSectionWindow != 0) { OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index d7277b84babe..d7015c6b0e28 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -448,7 +448,7 @@ void OViewsWindow::Paste() if (nCurrentPosition > 0) { pRet = (*(--aIter)); - if (pRet == NULL) + if (pRet == 0) { pRet = (*m_aSections.begin()); } @@ -466,7 +466,7 @@ void OViewsWindow::Paste() if ((nCurrentPosition + 1) < nSize) { pRet = *(++aIter); - if (pRet == NULL) + if (pRet == 0) { pRet = (*(--aEnd)); } |