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 /sfx2 | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/DeckLayouter.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index ade08bb99e5f..d68ae296d340 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -202,7 +202,7 @@ sal_Int32 DeckLayouter::PlacePanels ( // Assign heights and places. IterateLayoutItems(iItem,rLayoutItems) { - if (iItem->mpPanel == NULL) + if (iItem->mpPanel == 0) continue; Panel& rPanel (*iItem->mpPanel); @@ -294,7 +294,7 @@ void DeckLayouter::GetRequestedSizes ( IterateLayoutItems(iItem,rLayoutItems) { ui::LayoutSize aLayoutSize (ui::LayoutSize(0,0,0)); - if (iItem->mpPanel != NULL) + if (iItem->mpPanel != 0) { if (rLayoutItems.size() == 1 && iItem->mpPanel->IsTitleBarOptional()) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 43b719407206..a2efa70fb15f 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -291,9 +291,9 @@ void SidebarController::BroadcastPropertyChange (void) void SidebarController::NotifyResize (void) { - if (mpTabBar == NULL) + if (mpTabBar == 0) { - OSL_ASSERT(mpTabBar!=NULL); + OSL_ASSERT(mpTabBar!=0); return; } @@ -572,7 +572,7 @@ void SidebarController::SwitchToDeck ( rContext); bHasPanelSetChanged = true; } - if (aNewPanels[nWriteIndex] != NULL) + if (aNewPanels[nWriteIndex] != 0) { // Depending on the context we have to change the command // for the "more options" dialog. @@ -623,7 +623,7 @@ bool SidebarController::ArePanelSetsEqual ( return false; for (sal_Int32 nIndex=0,nCount=rCurrentPanels.size(); nIndex<nCount; ++nIndex) { - if (rCurrentPanels[nIndex] == NULL) + if (rCurrentPanels[nIndex] == 0) return false; if ( ! rCurrentPanels[nIndex]->GetId().equals(rRequestedPanels[nIndex].msId)) return false; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 1cbd18b544e6..aec18596a86a 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -182,7 +182,7 @@ void TabBar::Layout (void) Theme::GetInteger(Theme::Int_TabItemHeight)); // Place the menu button and the separator. - if (mpMenuButton != NULL) + if (mpMenuButton != 0) { mpMenuButton->SetPosSizePixel( Point(nX,nY), |