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 /sd/source/ui/view | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index b64532f390c5..26a92fe0bbc8 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -657,7 +657,7 @@ bool Outliner::SearchAndReplaceOnce (void) return true; ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); - if (pViewShell != NULL) + if (pViewShell != 0) { mpView = pViewShell->GetView(); mpWindow = pViewShell->GetActiveWindow(); @@ -907,7 +907,7 @@ void Outliner::RestoreStartPosition (void) bRestore = false; // Dont't restore when the view shell is not valid. ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); - if (pViewShell == NULL) + if (pViewShell == 0) bRestore = false; if (bRestore) @@ -1005,7 +1005,7 @@ void Outliner::ProvideNextTextObject (void) PutTextIntoOutliner (); ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); - if (pViewShell != NULL) + if (pViewShell != 0) switch (meMode) { case SEARCH: diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 67c22e176ee9..4c4d3bed98ca 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1520,7 +1520,7 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest) // shell types. if (bPanelIdGiven && ! (nPanelId==sidebar::PID_LAYOUT - && mrBase.GetMainViewShell()!=NULL + && mrBase.GetMainViewShell()!=0 && mrBase.GetMainViewShell()->GetShellType()==ViewShell::ST_OUTLINE)) { framework::FrameworkHelper::Instance(mrBase)->RequestSidebarPanel( @@ -1551,7 +1551,7 @@ void CurrentPageSetter::operator() (bool) { FrameView* pFrameView = NULL; - if (mrBase.GetMainViewShell() != NULL) + if (mrBase.GetMainViewShell() != 0) { pFrameView = mrBase.GetMainViewShell()->GetFrameView(); } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index a6393d8a523d..093e6e90e6ba 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1207,7 +1207,7 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( for (FactoryList::const_iterator iFactory=aRange.first; iFactory!=aRange.second; ++iFactory) { SharedShellFactory pFactory = iFactory->second; - if (pFactory != NULL) + if (pFactory != 0) aResult.mpShell = pFactory->CreateShell(nShellId, pParentWindow, pFrameView); // Exit the loop when the shell has been successfully created. |