diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:23:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:38 +0100 |
commit | 92c697c0e3e4bde88424322875c993c161696b1e (patch) | |
tree | ea1be62a0cb8fd7f7e63dd03a52441cedd8e96eb /sd/source/ui/animations | |
parent | 65464ed0985802edb96dbcbd1c3eed996f3778bd (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: If1b80da64ba575f07b31dce9bc0e34b7eb9f11a4
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 28 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 24 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 34 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 24 |
6 files changed, 59 insertions, 59 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 9f2c26ee569d..dfd303e83cb7 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -626,8 +626,8 @@ namespace { vcl::Window * lcl_GetTopmostParent( vcl::Window * pWindow ) { - vcl::Window * pResult = 0; - vcl::Window * pCurrent = pWindow ? pWindow->GetParent() : 0; + vcl::Window * pResult = nullptr; + vcl::Window * pCurrent = pWindow ? pWindow->GetParent() : nullptr; while( pCurrent ) { pResult = pCurrent; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 9103e73bce61..86c6723da8a8 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -206,9 +206,9 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorListRef pColorList; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; - if ( pDocSh && ( ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) != 0) ) + if ( pDocSh && ( ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) != nullptr) ) pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); if ( !pColorList.is() ) @@ -286,15 +286,15 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem; - const FontList* pFontList = 0; + const FontList* pFontList = nullptr; bool bMustDelete = false; - if ( pDocSh && ( (pItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ) ) != 0) ) + if ( pDocSh && ( (pItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ) ) != nullptr) ) pFontList = static_cast<const SvxFontListItem*>(pItem)->GetFontList(); if(!pFontList) { - pFontList = new FontList( Application::GetDefaultDevice(), NULL, false ); + pFontList = new FontList( Application::GetDefaultDevice(), nullptr, false ); bMustDelete = true; } @@ -358,7 +358,7 @@ private: DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) : Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), - mpSubControl(pSubControl),mpDropdownButton(0),mpMenu(pMenu) + mpSubControl(pSubControl),mpDropdownButton(nullptr),mpMenu(pMenu) { mpDropdownButton = VclPtr<MenuButton>::Create( this, WB_NOLIGHTBORDER | WB_RECTSTYLE | WB_NOTABSTOP); mpDropdownButton->SetSymbol(SymbolType::SPIN_DOWN); @@ -1080,9 +1080,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorListRef pColorList; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; - if ( pDocSh && ( (pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) != 0 ) ) + if ( pDocSh && ( (pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) != nullptr ) ) pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); if ( !pColorList.is() ) @@ -2203,7 +2203,7 @@ IMPL_LINK_NOARG_TYPED(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, v CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const OString& sPage) : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui") , mpSet( pSet ) -, mpResultSet( 0 ) +, mpResultSet( nullptr ) { get(mpTabControl, "tabs"); @@ -2227,7 +2227,7 @@ CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySe } else { - mpTextAnimTabPage = 0; + mpTextAnimTabPage = nullptr; mpTabControl->RemovePage( mnTextAnimId ); } @@ -2316,7 +2316,7 @@ STLPropertySet* CustomAnimationDialog::createDefaultSet() } PropertyControl::PropertyControl( vcl::Window* pParent ) -: ListBox( pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN ), mpSubControl(0) +: ListBox( pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN ), mpSubControl(nullptr) { } @@ -2340,7 +2340,7 @@ void PropertyControl::setSubControl( PropertySubControl* pSubControl ) mpSubControl = pSubControl; - Control* pControl = pSubControl ? pSubControl->getControl() : 0; + Control* pControl = pSubControl ? pSubControl->getControl() : nullptr; if( pControl ) { @@ -2357,7 +2357,7 @@ void PropertyControl::setSubControl( PropertySubControl* pSubControl ) void PropertyControl::Resize() { - Control* pControl = mpSubControl ? mpSubControl->getControl() : 0; + Control* pControl = mpSubControl ? mpSubControl->getControl() : nullptr; if( pControl ) pControl->SetPosSizePixel( GetPosPixel(), GetSizePixel() ); ListBox::Resize(); @@ -2369,7 +2369,7 @@ PropertySubControl::~PropertySubControl() PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link<LinkParamNone*,void>& rModifyHdl ) { - PropertySubControl* pSubControl = NULL; + PropertySubControl* pSubControl = nullptr; switch( nType ) { case nPropertyTypeDirection: diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 4df0848f3f8a..16c05d4f5699 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -307,7 +307,7 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev, SvLBoxItem* CustomAnimationListEntryItem::Create() const { - return NULL; + return nullptr; } void CustomAnimationListEntryItem::Clone( SvLBoxItem* ) @@ -415,7 +415,7 @@ void CustomAnimationTriggerEntryItem::Paint(const Point& rPos, SvTreeListBox& rD SvLBoxItem* CustomAnimationTriggerEntryItem::Create() const { - return NULL; + return nullptr; } void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) @@ -425,9 +425,9 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) CustomAnimationList::CustomAnimationList( vcl::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) , mbIgnorePaint(false) - , mpController(0) + , mpController(nullptr) , mnLastGroupId(0) - , mpLastParentEntry(0) + , mpLastParentEntry(nullptr) { EnableContextMenuHandling(); @@ -512,8 +512,8 @@ void CustomAnimationList::clear() { Clear(); - mpLastParentEntry = 0; - mxLastTargetShape = 0; + mpLastParentEntry = nullptr; + mxLastTargetShape = nullptr; } void CustomAnimationList::update( MainSequencePtr pMainSequence ) @@ -545,7 +545,7 @@ void CustomAnimationList::update() mbIgnorePaint = true; SetUpdateMode( false ); - CustomAnimationListEntry* pEntry = 0; + CustomAnimationListEntry* pEntry = nullptr; std::list< CustomAnimationEffectPtr > aExpanded; std::list< CustomAnimationEffectPtr > aSelected; @@ -608,7 +608,7 @@ void CustomAnimationList::update() long nFirstSelNew = -1; long nLastSelNew = -1; std::for_each( mpMainSequence->getBegin(), mpMainSequence->getEnd(), stl_append_effect_func( *this ) ); - mpLastParentEntry = 0; + mpLastParentEntry = nullptr; const InteractiveSequenceList& rISL = mpMainSequence->getInteractiveSequenceList(); @@ -635,7 +635,7 @@ void CustomAnimationList::update() pViewData->SetSelectable(false); std::for_each( pIS->getBegin(), pIS->getEnd(), stl_append_effect_func( *this ) ); - mpLastParentEntry = 0; + mpLastParentEntry = nullptr; } } @@ -719,7 +719,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) { aDescription = getDescription( aTarget, pEffect->getTargetSubItem() != ShapeAnimationSubType::ONLY_BACKGROUND ); - SvTreeListEntry* pParentEntry = 0; + SvTreeListEntry* pParentEntry = nullptr; Reference< XShape > xTargetShape( pEffect->getTargetShape() ); sal_Int32 nGroupId = pEffect->getGroupId(); @@ -834,7 +834,7 @@ bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect ) if( pEntry ) pEntry = static_cast<CustomAnimationListEntry*>(GetParent( pEntry )); - return (pEntry == 0) || IsExpanded( pEntry ); + return (pEntry == nullptr) || IsExpanded( pEntry ); } EffectSequence CustomAnimationList::getSelection() const @@ -943,7 +943,7 @@ void CustomAnimationList::Paint(vcl::RenderContext& rRenderContext, const Rectan SvTreeListBox::Paint(rRenderContext, rRect); // draw help text if list box is still empty - if( First() == 0 ) + if( First() == nullptr ) { Color aOldColor(rRenderContext.GetTextColor()); rRenderContext.SetTextColor(rRenderContext.GetSettings().GetStyleSettings().GetDisableColor()); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index bac92fa6c6f4..ba817a62f2fb 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -150,7 +150,7 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, const Size& rMinSize ) : PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ), mrBase( rBase ), - mpCustomAnimationPresets(NULL), + mpCustomAnimationPresets(nullptr), mnPropertyType( nPropertyTypeNone ), maMinSize( rMinSize ), mxModel( rBase.GetDocShell()->GetDoc()->getUnoModel(), UNO_QUERY ), @@ -321,7 +321,7 @@ IMPL_LINK_TYPED(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() != 0) + if (mrBase.GetMainViewShell() != nullptr) { if( mrBase.GetMainViewShell()->GetShellType() == ViewShell::ST_IMPRESS ) { @@ -333,8 +333,8 @@ IMPL_LINK_TYPED(CustomAnimationPane,EventMultiplexerListener, } // fall through intended case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: - mxView = 0; - mxCurrentPage = 0; + mxView = nullptr; + mxCurrentPage = nullptr; updateControls(); break; @@ -526,7 +526,7 @@ void CustomAnimationPane::updateControls() CustomAnimationPresetPtr pDescriptor = getPresets().getEffectDescriptor( pEffect->getPresetId() ); if( pDescriptor.get() ) { - PropertySubControl* pSubControl = NULL; + PropertySubControl* pSubControl = nullptr; Any aValue; @@ -555,16 +555,16 @@ void CustomAnimationPane::updateControls() } else { - mpLBProperty->setSubControl( 0 ); + mpLBProperty->setSubControl( nullptr ); } - bool bEnable = (pSubControl != 0) && (pSubControl->getControl()->IsEnabled()); + bool bEnable = (pSubControl != nullptr) && (pSubControl->getControl()->IsEnabled()); mpLBProperty->Enable( bEnable ); mpFTProperty->Enable( bEnable ); } else { - mpLBProperty->setSubControl( 0 ); + mpLBProperty->setSubControl( nullptr ); mpFTProperty->Enable( false ); mpLBProperty->Enable( false ); mpPBPropertyMore->Enable( false ); @@ -610,7 +610,7 @@ void CustomAnimationPane::updateControls() } else { - mpLBProperty->setSubControl( 0 ); + mpLBProperty->setSubControl( nullptr ); mpFTProperty->Enable( false ); mpLBProperty->Enable( false ); mpPBPropertyMore->Enable( false ); @@ -654,7 +654,7 @@ void CustomAnimationPane::updateControls() { MainSequenceRebuildGuard aGuard( mpMainSequence ); - EffectSequenceHelper* pSequence = 0; + EffectSequenceHelper* pSequence = nullptr; EffectSequence::iterator aRebuildIter( maListSelection.begin() ); const EffectSequence::iterator aRebuildEnd( maListSelection.end() ); while( aRebuildIter != aRebuildEnd ) @@ -663,7 +663,7 @@ void CustomAnimationPane::updateControls() if( pEffect.get() ) { - if( pSequence == 0 ) + if( pSequence == nullptr ) { pSequence = pEffect->getEffectSequence(); } @@ -737,7 +737,7 @@ void CustomAnimationPane::updateMotionPathTags() MotionPathTagVector aTags; aTags.swap( maMotionPathTags ); - ::sd::View* pView = 0; + ::sd::View* pView = nullptr; if( mxView.is() ) { @@ -2067,7 +2067,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) return; EffectSequenceHelper* pSequence = maListSelection.front()->getEffectSequence(); - if( pSequence == 0 ) + if( pSequence == nullptr ) return; addUndo(); @@ -2217,7 +2217,7 @@ void CustomAnimationPane::onSelect() const CustomAnimationPresets& CustomAnimationPane::getPresets() { - if (mpCustomAnimationPresets == NULL) + if (mpCustomAnimationPresets == nullptr) mpCustomAnimationPresets = &CustomAnimationPresets::getCustomAnimationPresets(); return *mpCustomAnimationPresets; } @@ -2229,7 +2229,7 @@ void CustomAnimationPane::markShapesFromSelectedEffects() ScopeLockGuard aGuard( maSelectionLock ); DrawViewShell* pViewShell = dynamic_cast< DrawViewShell* >( FrameworkHelper::Instance(mrBase)->GetViewShell(FrameworkHelper::msCenterPaneURL).get()); - DrawView* pView = pViewShell ? pViewShell->GetDrawView() : NULL; + DrawView* pView = pViewShell ? pViewShell->GetDrawView() : nullptr; if( pView ) { @@ -2256,7 +2256,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot { SdrPathObj* pPathObj = xTag->getPathObj(); CustomAnimationEffectPtr pEffect = xTag->getEffect(); - if( (pPathObj != 0) && pEffect.get() != 0 ) + if( (pPathObj != nullptr) && pEffect.get() != nullptr ) { ::svl::IUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager(); if( pManager ) @@ -2273,7 +2273,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - vcl::Window* pWindow = 0; + vcl::Window* pWindow = nullptr; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index fa7f3aebac63..ac54d9ca128d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -960,7 +960,7 @@ IMPL_LINK_TYPED(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() != 0) + if (mrBase.GetMainViewShell() != nullptr) { mxView.set(mrBase.GetController(), css::uno::UNO_QUERY); onSelectionChanged(); @@ -1129,7 +1129,7 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void) vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - vcl::Window* pWindow = 0; + vcl::Window* pWindow = nullptr; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 3e03f32a67a5..c30d53fa67d0 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -368,7 +368,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con MotionPathTag::~MotionPathTag() { - DBG_ASSERT( mpPathObj == 0, "sd::MotionPathTag::~MotionPathTag(), dispose me first!" ); + DBG_ASSERT( mpPathObj == nullptr, "sd::MotionPathTag::~MotionPathTag(), dispose me first!" ); Dispose(); } @@ -402,7 +402,7 @@ void MotionPathTag::updatePathAttributes() void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { - if( mpPathObj && !mbInUpdatePath && dynamic_cast< const SdrHint* >( &rHint ) && (mpEffect.get() != 0) ) + if( mpPathObj && !mbInUpdatePath && dynamic_cast< const SdrHint* >( &rHint ) && (mpEffect.get() != nullptr) ) { if( mxPolyPoly != mpPathObj->GetPathPoly() ) { @@ -505,7 +505,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) if (mrView.IsPointMarked(*pHdl) ) { mrView.UnmarkPoint(*pHdl); - pHdl = NULL; + pHdl = nullptr; } else { @@ -543,7 +543,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) pDragMethod = new PathDragResize( mrView, xTag, aDragPoly ); } - mrView.BegDragObj(aMDPos, NULL, pHdl, nDrgLog, pDragMethod ); + mrView.BegDragObj(aMDPos, nullptr, pHdl, nDrgLog, pDragMethod ); } return true; } @@ -652,10 +652,10 @@ bool MotionPathTag::OnMarkHandle( const KeyEvent& rKEvt ) mrView.MarkPoint(*pHdl); } - if(0L == rHdlList.GetFocusHdl()) + if(nullptr == rHdlList.GetFocusHdl()) { // restore point with focus - SdrHdl* pNewOne = 0L; + SdrHdl* pNewOne = nullptr; for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a) { @@ -715,7 +715,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) // start dragging rtl::Reference< MotionPathTag > xTag( this ); - SdrDragMethod* pDragMethod = 0; + SdrDragMethod* pDragMethod = nullptr; if( (pHdl->GetKind() == HDL_MOVE) || (pHdl->GetKind() == HDL_SMARTTAG) ) { pDragMethod = new PathDragMove( mrView, xTag ); @@ -728,7 +728,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) { pDragMethod = new PathDragResize( mrView, xTag ); } - mrView.BegDragObj(aStartPoint, 0, pHdl, 0, pDragMethod); + mrView.BegDragObj(aStartPoint, nullptr, pHdl, 0, pDragMethod); if(mrView.IsDragObj()) { @@ -822,7 +822,7 @@ bool MotionPathTag::MarkPoints(const Rectangle* pRect, bool bUnmark ) if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected() == bUnmark) { Point aPos(pHdl->GetPos()); - if( pRect==NULL || pRect->IsInside(aPos)) + if( pRect==nullptr || pRect->IsInside(aPos)) { if( mrView.MarkPointHelper(pHdl,mpMark,bUnmark) ) bChgd=true; @@ -934,7 +934,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++) { SdrHdl* pPlusHdl = mpPathObj->GetPlusHdl(*pSmartHdl,nPlusNum); - if (pPlusHdl!=NULL) + if (pPlusHdl!=nullptr) { pPlusHdl->SetObj(mpPathObj); pPlusHdl->SetPageView(mrView.GetSdrPageView()); @@ -998,7 +998,7 @@ void MotionPathTag::disposing() if( mpPathObj ) { SdrPathObj* pPathObj = mpPathObj; - mpPathObj = 0; + mpPathObj = nullptr; mrView.updateHandles(); delete pPathObj; } @@ -1006,7 +1006,7 @@ void MotionPathTag::disposing() if( mpMark ) { delete mpMark; - mpMark = 0; + mpMark = nullptr; } SmartTag::disposing(); |