diff options
43 files changed, 69 insertions, 69 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 89b192ac158b..31c939058c26 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -221,7 +221,7 @@ void OJoinController::SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, lo { // the data for the window TTableWindowData::value_type pData = pTabWin->GetData(); - OSL_ENSURE(pData != NULL, "SaveTabWinPosSize : TabWin hat keine Daten !"); + OSL_ENSURE(pData != 0, "SaveTabWinPosSize : TabWin hat keine Daten !"); // set Position & Size of data anew (with current window parameters) Point aPos = pTabWin->GetPosPixel(); diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 1971bcce2845..cbf8b93a73ac 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -914,7 +914,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn if (pTabWin->Init()) { TTableWindowData::value_type pData = pTabWin->GetData(); - OSL_ENSURE(pData != NULL, "OQueryTableView::ShowTabWin : TabWin has no data !"); + OSL_ENSURE(pData != 0, "OQueryTableView::ShowTabWin : TabWin has no data !"); // If there is a position and size defined, we use them if (pData->HasPosition() && pData->HasSize()) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 70654ce4f535..839b470cd3ee 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -344,7 +344,7 @@ sal_Bool OTableEditorCtrl::SetDataPtr( long nRow ) if(nRow >= (long)m_pRowList->size()) return sal_False; pActRow = (*m_pRowList)[nRow]; - return pActRow != NULL; + return pActRow != 0; } //------------------------------------------------------------------------------ diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 740858e53406..6013c3968a3f 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -281,7 +281,7 @@ void PPTShape::addShape( } if( pPPTPlaceholder->mpPlaceholder.get() ) { SAL_INFO("oox.ppt","placeholder has parent placeholder: " << pPPTPlaceholder->mpPlaceholder->getId() << " type: " << lclDebugSubType( pPPTPlaceholder->mpPlaceholder->getSubType() ) << " index: " << pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().get() ); - SAL_INFO("oox.ppt","has textbody " << (pPPTPlaceholder->mpPlaceholder->getTextBody() != NULL) ); + SAL_INFO("oox.ppt","has textbody " << (pPPTPlaceholder->mpPlaceholder->getTextBody() != 0) ); TextListStylePtr pPlaceholderStyle = getSubTypeTextListStyle( rSlidePersist, pPPTPlaceholder->mpPlaceholder->getSubType() ); if( pPPTPlaceholder->mpPlaceholder->getTextBody() ) pNewTextListStyle->apply( pPPTPlaceholder->mpPlaceholder->getTextBody()->getTextListStyle() ); diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index a42fe8d131d4..ac8af0b9bc10 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -63,9 +63,9 @@ oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, co { if ( (*aRevIter)->getSubType() == nMasterPlaceholder ) { - if( !oSubTypeIndex.has() && aChoiceShapePtr1 == NULL ) + if( !oSubTypeIndex.has() && aChoiceShapePtr1 == 0 ) aChoiceShapePtr1 = *aRevIter; - else if( aChoiceShapePtr2 == NULL ) + else if( aChoiceShapePtr2 == 0 ) aChoiceShapePtr2 = *aRevIter; if( (*aRevIter)->getSubTypeIndex() == oSubTypeIndex ) { @@ -79,7 +79,7 @@ oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, co break; ++aRevIter; } - if( aShapePtr == NULL ) + if( aShapePtr == 0 ) return aChoiceShapePtr1 ? aChoiceShapePtr1 : aChoiceShapePtr2; return aShapePtr; } diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index ddba98e6a43b..b53fcb258fff 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -174,7 +174,7 @@ void setTextStyle( Reference< beans::XPropertySet >& rxPropSet, const XmlFilterB oox::drawingml::TextListStylePtr& pTextListStylePtr, int nLevel ) { ::oox::drawingml::TextParagraphPropertiesPtr pTextParagraphPropertiesPtr( pTextListStylePtr->getListStyle()[ nLevel ] ); - if( pTextParagraphPropertiesPtr == NULL ) + if( pTextParagraphPropertiesPtr == 0 ) { // no properties. return return; 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)); } diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index d579eaadd30c..bd6eb92347a4 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -110,7 +110,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rStream.WriteUniOrByteString( aTopic, eCharSet ); rStream.WriteUniOrByteString( aItem, eCharSet ); - sal_Bool bHasValue = ( pResult != NULL ); + sal_Bool bHasValue = ( pResult != 0 ); rStream << bHasValue; if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index b95b66035a8f..b56f7802866a 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -579,7 +579,7 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx ) aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) ); // list of NOTE records, generated by the cell table - if( mxNoteList != NULL && !mxNoteList->IsEmpty() ) + if( mxNoteList != 0 && !mxNoteList->IsEmpty() ) aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) ); // web queries 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. 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), diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 46b88dae7de3..c968809e20ea 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1330,7 +1330,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) ? ::utl::UcbStreamHelper::CreateStream(xStream) : 0 ); - if( pStream != NULL ) + if( pStream != 0 ) { Graphic aGraphic; diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index b58fee87f2a5..ce79ae23fcb4 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -1283,7 +1283,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() WW8TableCellGridRow::Pointer_t pRow = getRow(*aTopsIt); WidthsPtr pWidths = pRow->getWidths(); - if (pWidths != NULL) + if (pWidths != 0) { sResult += "<widths>"; diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 097a8a7eac5a..6d52d6b96e7d 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1825,7 +1825,7 @@ void WW8_WrPlcSepx::WriteSepx( SvStream& rStrm ) const for (size_t i = 0; i < m_SectionAttributes.size(); i++) // all sections { WW8_PdAttrDesc *const pA = m_SectionAttributes[i].get(); - if (pA->m_nLen && pA->m_pData != NULL) + if (pA->m_nLen && pA->m_pData != 0) { SVBT16 nL; pA->m_nSepxFcPos = rStrm.Tell(); diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 41cfb0f0a515..50bb0bd27db2 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -625,7 +625,7 @@ namespace DOM AttrChangeType aChangeType = AttrChangeType_MODIFICATION; ::boost::shared_ptr<xmlChar const> const pOld( xmlGetProp(m_aNodePtr, xName), xmlFree); - if (pOld == NULL) { + if (pOld == 0) { aChangeType = AttrChangeType_ADDITION; xmlNewProp(m_aNodePtr, xName, xValue); } else { @@ -708,7 +708,7 @@ namespace DOM AttrChangeType aChangeType = AttrChangeType_MODIFICATION; ::boost::shared_ptr<xmlChar const> const pOld( xmlGetNsProp(m_aNodePtr, xLName, pNs->href), xmlFree); - if (pOld == NULL) { + if (pOld == 0) { aChangeType = AttrChangeType_ADDITION; xmlNewNsProp(m_aNodePtr, pNs, xLName, xValue); } else { diff --git a/unoxml/source/xpath/nodelist.cxx b/unoxml/source/xpath/nodelist.cxx index 2a3c9ff978c8..dbe225bcbc95 100644 --- a/unoxml/source/xpath/nodelist.cxx +++ b/unoxml/source/xpath/nodelist.cxx @@ -31,7 +31,7 @@ namespace XPath , m_rMutex(rMutex) , m_pNodeSet(0) { - if (rxpathObj != NULL && rxpathObj->type == XPATH_NODESET) + if (rxpathObj != 0 && rxpathObj->type == XPATH_NODESET) { m_pNodeSet = rxpathObj->nodesetval; m_pXPathObj = rxpathObj; diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 6a50933e47c5..690dcfc32ff5 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -374,7 +374,7 @@ namespace XPath /* Create xpath evaluation context */ ::boost::shared_ptr<xmlXPathContext> const xpathCtx( xmlXPathNewContext(pDoc), xmlXPathFreeContext); - if (xpathCtx == NULL) { throw XPathException(); } + if (xpathCtx == 0) { throw XPathException(); } // set context node xpathCtx->node = pNode; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 561243448498..0be87b7fee49 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3622,7 +3622,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) m_pImpl->SetFieldResult( sText ); else { - if (pContext == NULL) + if (pContext == 0) pContext.reset(new PropertyMap()); m_pImpl->appendTextPortion( sText, pContext ); @@ -3709,7 +3709,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) m_pImpl->SetFieldResult( sText ); else { - if (pContext == NULL) + if (pContext == 0) pContext.reset(new PropertyMap()); m_pImpl->appendTextPortion( sText, pContext ); diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx index 3ec1a8887eff..d7c9bc51445c 100644 --- a/writerfilter/source/dmapper/FormControlHelper.hxx +++ b/writerfilter/source/dmapper/FormControlHelper.hxx @@ -41,7 +41,7 @@ public: bool insertControl(uno::Reference<text::XTextRange> xTextRange); bool processField(uno::Reference<text::XFormField> xFormField); - bool hasFFDataHandler() const { return (m_pFFData != NULL); } + bool hasFFDataHandler() const { return (m_pFFData != 0); } private: FFDataHandler::Pointer_t m_pFFData; struct FormControlHelper_Impl; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 98dacdf9a6a0..1923c867470c 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -1155,7 +1155,7 @@ AbstractListDef::Pointer ListsManager::GetAbstractList( sal_Int32 nId ) if( pStyleSheetProperties && pStyleSheetProperties->GetNumId() >= 0 ) { ListDef::Pointer pList = GetList( pStyleSheetProperties->GetNumId() ); - if ( pList!=NULL ) + if ( pList!=0 ) return pList->GetAbstractDefinition(); else pAbstractList = m_aAbstractLists[i]; diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx index 5457fefe352d..0d185a810578 100644 --- a/writerfilter/source/doctok/DffImpl.cxx +++ b/writerfilter/source/doctok/DffImpl.cxx @@ -39,7 +39,7 @@ protected: public: static Pointer_t Instance() { - if (pInstance == NULL) + if (pInstance == 0) pInstance = Pointer_t(new ShapeTypeToString()); return pInstance; diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx index cfdae5ff777c..9e914a4cab41 100644 --- a/writerfilter/source/doctok/WW8DocumentImpl.cxx +++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx @@ -1174,7 +1174,7 @@ WW8DocumentImpl::getBlip(sal_uInt32 nBid) { writerfilter::Reference<Properties>::Pointer_t pResult; - if (mpDffBlock != NULL) + if (mpDffBlock != 0) { DffRecord::Pointer_t pDffRecord(mpDffBlock->getBlip(nBid)); diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx index c77b68249492..10f5891eb239 100644 --- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx +++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx @@ -118,7 +118,7 @@ string WW8TableReference::getType() const void WW8PropertiesReference::resolve(Properties & rHandler) { - if (mpPropSet != NULL) + if (mpPropSet != 0) { if (mpPropSet->isPap()) { diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 94f91c08a10b..f35a46defd9a 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1928,7 +1928,7 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels ) static OUString s_NumberingStyleName( "NumberingStyleName"); static OUString s_HeadingStyleName( "HeadingStyleName"); - if ((m_pImpl->m_pOutlineStylesCandidates != NULL || bSetEmptyLevels) && + if ((m_pImpl->m_pOutlineStylesCandidates != 0 || bSetEmptyLevels) && m_pImpl->m_xChapterNumbering.is() && !IsInsertMode()) { |