summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-22 20:16:28 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-24 12:40:46 +0300
commit6cf30940750607eeb062113dbee9968769d7bd06 (patch)
tree5d30410c5f32f45105d896c065da3fffbd5edf88 /sd
parent503b248127a92b9ad190e05f6a1d50574183cd47 (diff)
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx4
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx2
-rw-r--r--sd/source/ui/sidebar/PanelBase.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageSelector.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx28
-rw-r--r--sd/source/ui/slidesorter/model/SlideSorterModel.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx6
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx2
16 files changed, 33 insertions, 33 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index eee8e847a7cb..ea26cc318264 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -345,7 +345,7 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener,
// At this moment the controller may not yet been set at model
// or ViewShellBase. Take it from the view shell passed with
// the event.
- if (mrBase.GetMainViewShell() != NULL)
+ if (mrBase.GetMainViewShell() != 0)
{
if( mrBase.GetMainViewShell()->GetShellType() == ViewShell::ST_IMPRESS )
{
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 20334b3477f9..bcb4af23999c 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1176,7 +1176,7 @@ IMPL_LINK(SlideTransitionPane,EventMultiplexerListener,
// At this moment the controller may not yet been set at
// model or ViewShellBase. Take it from the view shell
// passed with the event.
- if (mrBase.GetMainViewShell() != NULL)
+ if (mrBase.GetMainViewShell() != 0)
{
mxView = Reference<drawing::XDrawView>::query(mrBase.GetController());
onSelectionChanged();
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 45191b372d5c..2e48e175768a 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -368,7 +368,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
if (xWindow.is())
{
xWindow->addWindowListener(pDescriptor->mpWrapper);
- if (pDescriptor->mpViewShell != NULL)
+ if (pDescriptor->mpViewShell != 0)
{
pDescriptor->mpViewShell->Resize();
}
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index c4d5dd11bf72..f2804c1f20b5 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -154,7 +154,7 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible)
if (mpWindow != NULL)
mpWindow->Show(bIsVisible);
- if (mpWorkWindow != NULL)
+ if (mpWorkWindow != 0)
mpWorkWindow->Show(bIsVisible);
}
@@ -166,7 +166,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessibl
{
ThrowIfDisposed();
- if (mpWorkWindow != NULL)
+ if (mpWorkWindow != 0)
return mpWorkWindow->GetAccessible(sal_False);
else
return NULL;
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 091c3f5c5aff..b69821577e66 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -245,7 +245,7 @@ void SAL_CALL TaskPanelFactory::releaseResource (
const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ];
::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) );
const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) );
- if ( pPaneViewShell != NULL )
+ if ( pPaneViewShell != 0 )
{
const OUString sPanelResourceURL( xResourceId->getResourceURL() );
const toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sPanelResourceURL ) );
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 582a3fed43e3..46a60e644d2b 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -695,7 +695,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void)
MasterPageContainerType::const_iterator iDescriptor;
MasterPageContainerType::const_iterator iContainerEnd(maContainer.end());
for (iDescriptor=maContainer.begin(); iDescriptor!=iContainerEnd; ++iDescriptor)
- if (*iDescriptor!=NULL && (*iDescriptor)->mpMasterPage != NULL)
+ if (*iDescriptor!=0 && (*iDescriptor)->mpMasterPage != NULL)
{
Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize());
OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0);
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index 014ee8a4cde3..350eb8852345 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -101,7 +101,7 @@ void PanelBase::Resize (void)
void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar)
{
mxSidebar = rxSidebar;
- if (mxSidebar.is() && mpWrappedControl!=NULL)
+ if (mxSidebar.is() && mpWrappedControl!=0)
mxSidebar->requestLayout();
}
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index fa4e09f955bc..915888ce7043 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -657,7 +657,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent)
: ViewShell::OUTPUT_DRAWMODE_COLOR);
if (mrSlideSorter.GetViewShell() != NULL)
mrSlideSorter.GetViewShell()->GetFrameView()->SetDrawMode(nDrawMode);
- if (pActiveWindow != NULL)
+ if (pActiveWindow != 0)
pActiveWindow->SetDrawMode(nDrawMode);
mrView.HandleDrawModeChange();
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index 9bf7c3405f5f..79663a8fbf5f 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -178,7 +178,7 @@ void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor)
mrSlideSorter.GetView().RequestRepaint(rpDescriptor);
mpMostRecentlySelectedPage = rpDescriptor;
- if (mpSelectionAnchor == NULL)
+ if (mpSelectionAnchor == 0)
mpSelectionAnchor = rpDescriptor;
if (mnBroadcastDisableLevel > 0)
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 7387e6c1d23f..f1da5e0a16a2 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -86,12 +86,12 @@ void ScrollBarManager::LateInitialization (void)
void ScrollBarManager::Connect (void)
{
- if (mpVerticalScrollBar != NULL)
+ if (mpVerticalScrollBar != 0)
{
mpVerticalScrollBar->SetScrollHdl (
LINK(this, ScrollBarManager, VerticalScrollBarHandler));
}
- if (mpHorizontalScrollBar != NULL)
+ if (mpHorizontalScrollBar != 0)
{
mpHorizontalScrollBar->SetScrollHdl(
LINK(this, ScrollBarManager, HorizontalScrollBarHandler));
@@ -103,11 +103,11 @@ void ScrollBarManager::Connect (void)
void ScrollBarManager::Disconnect (void)
{
- if (mpVerticalScrollBar != NULL)
+ if (mpVerticalScrollBar != 0)
{
mpVerticalScrollBar->SetScrollHdl (Link());
}
- if (mpHorizontalScrollBar != NULL)
+ if (mpHorizontalScrollBar != 0)
{
mpHorizontalScrollBar->SetScrollHdl (Link());
}
@@ -137,13 +137,13 @@ Rectangle ScrollBarManager::PlaceScrollBars (
bIsHorizontalScrollBarAllowed,
bIsVerticalScrollBarAllowed));
- if (mpHorizontalScrollBar!=NULL && mpHorizontalScrollBar->IsVisible())
+ if (mpHorizontalScrollBar!=0 && mpHorizontalScrollBar->IsVisible())
PlaceHorizontalScrollBar (rAvailableArea);
- if (mpVerticalScrollBar!=NULL && mpVerticalScrollBar->IsVisible())
+ if (mpVerticalScrollBar!=0 && mpVerticalScrollBar->IsVisible())
PlaceVerticalScrollBar (rAvailableArea);
- if (mpScrollBarFiller!=NULL && mpScrollBarFiller->IsVisible())
+ if (mpScrollBarFiller!=0 && mpScrollBarFiller->IsVisible())
PlaceFiller (rAvailableArea);
return aRemainingSpace;
@@ -214,7 +214,7 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro
// The horizontal scroll bar is only shown when the window is
// horizontally smaller than the view.
- if (mpHorizontalScrollBar != NULL && mpHorizontalScrollBar->IsVisible())
+ if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible())
{
mpHorizontalScrollBar->Show();
mpHorizontalScrollBar->SetRange (
@@ -244,7 +244,7 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro
}
// The vertical scroll bar is always shown.
- if (mpVerticalScrollBar != NULL && mpVerticalScrollBar->IsVisible())
+ if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible())
{
mpVerticalScrollBar->SetRange (
Range(aModelArea.Top(), aModelArea.Bottom()));
@@ -293,7 +293,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar)
if (pScrollBar!=NULL
&& pScrollBar==mpVerticalScrollBar.get()
&& pScrollBar->IsVisible()
- && mrSlideSorter.GetContentWindow()!=NULL)
+ && mrSlideSorter.GetContentWindow()!=0)
{
double nRelativePosition = double(pScrollBar->GetThumbPos())
/ double(pScrollBar->GetRange().Len());
@@ -312,7 +312,7 @@ IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar)
if (pScrollBar!=NULL
&& pScrollBar==mpHorizontalScrollBar.get()
&& pScrollBar->IsVisible()
- && mrSlideSorter.GetContentWindow()!=NULL)
+ && mrSlideSorter.GetContentWindow()!=0)
{
double nRelativePosition = double(pScrollBar->GetThumbPos())
/ double(pScrollBar->GetRange().Len());
@@ -485,7 +485,7 @@ void ScrollBarManager::SetTopLeft (const Point aNewTopLeft)
int ScrollBarManager::GetVerticalScrollBarWidth (void) const
{
- if (mpVerticalScrollBar != NULL && mpVerticalScrollBar->IsVisible())
+ if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible())
return mpVerticalScrollBar->GetSizePixel().Width();
else
return 0;
@@ -496,7 +496,7 @@ int ScrollBarManager::GetVerticalScrollBarWidth (void) const
int ScrollBarManager::GetHorizontalScrollBarHeight (void) const
{
- if (mpHorizontalScrollBar != NULL && mpHorizontalScrollBar->IsVisible())
+ if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible())
return mpHorizontalScrollBar->GetSizePixel().Height();
else
return 0;
@@ -518,7 +518,7 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition)
pWindow->LogicToPixel(mrSlideSorter.GetView().GetModelArea()));
if (aWindowSize.Width() > maScrollBorder.Width() * 3
- && mpHorizontalScrollBar != NULL
+ && mpHorizontalScrollBar != 0
&& mpHorizontalScrollBar->IsVisible())
{
if (rMouseWindowPosition.X() < maScrollBorder.Width()
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index ca27a7acc6cf..7c2ea3d79f1c 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -212,7 +212,7 @@ SharedPageDescriptor SlideSorterModel::GetPageDescriptor (
if (nPageIndex>=0 && nPageIndex<GetPageCount())
{
pDescriptor = maPageDescriptors[nPageIndex];
- if (pDescriptor == NULL && bCreate && mxSlides.is())
+ if (pDescriptor == 0 && bCreate && mxSlides.is())
{
SdPage* pPage = GetPage(nPageIndex);
pDescriptor.reset(new PageDescriptor (
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index c20acf90981a..8c725f882ec5 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -201,7 +201,7 @@ void PageObjectPainter::PaintPreview (
PageObjectLayouter::Preview,
PageObjectLayouter::ModelCoordinateSystem));
- if (mpCache != NULL)
+ if (mpCache != 0)
{
const SdrPage* pPage = rpDescriptor->GetPage();
mpCache->SetPreciousFlag(pPage, true);
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 1a59444fe92d..cfad63c71eb5 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -697,7 +697,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void)
MasterPageContainerType::const_iterator iDescriptor;
MasterPageContainerType::const_iterator iContainerEnd(maContainer.end());
for (iDescriptor=maContainer.begin(); iDescriptor!=iContainerEnd; ++iDescriptor)
- if (*iDescriptor!=NULL && (*iDescriptor)->mpMasterPage != NULL)
+ if (*iDescriptor!=0 && (*iDescriptor)->mpMasterPage != NULL)
{
Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize());
OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0);
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.