diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:15:45 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:26 +0100 |
commit | 11d365241808405483b79efd7879fa04bee8945e (patch) | |
tree | fae079e798f502f1766fa11a9db0b75fd5c44533 /forms/source/richtext | |
parent | 3cdda9af2c12a9ae2a1f0bdf8ca898f1f5c69bfb (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ic67c3138ca66c6b6d6fcf76b09d4581e23f51f8d
Diffstat (limited to 'forms/source/richtext')
-rw-r--r-- | forms/source/richtext/attributedispatcher.cxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/clipboarddispatcher.cxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/parametrizedattributedispatcher.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 14 | ||||
-rw-r--r-- | forms/source/richtext/richtextengine.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextimplcontrol.cxx | 10 | ||||
-rw-r--r-- | forms/source/richtext/richtextimplcontrol.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextmodel.cxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextviewport.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextviewport.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/rtattributehandler.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/rtattributes.hxx | 8 | ||||
-rw-r--r-- | forms/source/richtext/specialdispatchers.cxx | 10 |
16 files changed, 36 insertions, 36 deletions
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index 971d66a43b6c..768d3f28becb 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -51,7 +51,7 @@ namespace frm void OAttributeDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) { - m_pMasterDispatcher = NULL; + m_pMasterDispatcher = nullptr; ORichTextFeatureDispatcher::disposing( _rClearBeforeNotify ); } @@ -102,7 +102,7 @@ namespace frm #endif if ( m_pMasterDispatcher ) - m_pMasterDispatcher->executeAttribute( m_nAttributeId, NULL ); + m_pMasterDispatcher->executeAttribute( m_nAttributeId, nullptr ); } diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 84e82be27d43..09cbdbc5039d 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -130,7 +130,7 @@ namespace frm OPasteClipboardDispatcher::OPasteClipboardDispatcher( EditView& _rView ) :OClipboardDispatcher( _rView, ePaste ) - ,m_pClipListener( NULL ) + ,m_pClipListener( nullptr ) ,m_bPastePossible( false ) { m_pClipListener = new TransferableClipboardListener( LINK( this, OPasteClipboardDispatcher, OnClipboardChanged ) ); @@ -172,7 +172,7 @@ namespace frm m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), false ); m_pClipListener->release(); - m_pClipListener = NULL; + m_pClipListener = nullptr; } OClipboardDispatcher::disposing( _rClearBeforeNotify ); diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 34c6efb73193..66740eb5afa2 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -61,7 +61,7 @@ namespace frm void ORichTextFeatureDispatcher::disposing( ::osl::ClearableMutexGuard& /*_rClearBeforeNotify*/ ) { - m_pEditView = NULL; + m_pEditView = nullptr; } diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index b90da3285617..47fe59a182a3 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -97,7 +97,7 @@ namespace frm SfxAllItemSet aParameterSet( getEditView()->GetEmptyItemSet() ); TransformParameters( nSlotId, _rArguments, aParameterSet ); - const SfxPoolItem* pArgument = NULL; + const SfxPoolItem* pArgument = nullptr; if ( aParameterSet.Count() ) { OSL_ENSURE( aParameterSet.Count() == 1, "OParametrizedAttributeDispatcher::convertDispatchArgsToItem: Arguments which form more than 1 item? How this?" ); diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 1dc7d24dcc45..b3830c583a33 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -170,7 +170,7 @@ namespace frm mbCreatingPeer = true; // determine the VLC window for the parent - vcl::Window* pParentWin = NULL; + vcl::Window* pParentWin = nullptr; if ( _rParentPeer.is() ) { VCLXWindow* pParentXWin = VCLXWindow::GetImplementation( _rParentPeer ); @@ -277,7 +277,7 @@ namespace frm RichTextEngine* pEngine = ORichTextModel::getEditEngine( _rxModel ); OSL_ENSURE( pEngine, "ORichTextPeer::Create: could not obtaine the edit engine from the model!" ); if ( !pEngine ) - return NULL; + return nullptr; // the peer itself ORichTextPeer* pPeer = new ORichTextPeer; @@ -339,7 +339,7 @@ namespace frm return; OutputDevice* pTargetDevice = VCLUnoHelper::GetOutputDevice( getGraphics() ); - OSL_ENSURE( pTargetDevice != NULL, "ORichTextPeer::draw: no graphics -> no drawing!" ); + OSL_ENSURE( pTargetDevice != nullptr, "ORichTextPeer::draw: no graphics -> no drawing!" ); if ( !pTargetDevice ) return; @@ -468,10 +468,10 @@ namespace frm VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl >(); OSL_PRECOND( pRichTextControl, "ORichTextPeer::implCreateDispatcher: invalid window!" ); if ( !pRichTextControl ) - return SingleAttributeDispatcher( NULL ); + return SingleAttributeDispatcher( nullptr ); - ORichTextFeatureDispatcher* pDispatcher = NULL; - OAttributeDispatcher* pAttributeDispatcher = NULL; + ORichTextFeatureDispatcher* pDispatcher = nullptr; + OAttributeDispatcher* pAttributeDispatcher = nullptr; switch ( _nSlotId ) { case SID_CUT: @@ -550,7 +550,7 @@ namespace frm { SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); - const SfxType* pType = pSlot ? pSlot->GetType() : NULL; + const SfxType* pType = pSlot ? pSlot->GetType() : nullptr; if ( pType ) { bNeedParametrizedDispatcher = ( pType->nAttribs > 0 ); diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index bce9f149c848..ede2b4dccb9e 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -82,7 +82,7 @@ namespace frm RichTextEngine* RichTextEngine::Clone() { - RichTextEngine* pClone( NULL ); + RichTextEngine* pClone( nullptr ); { SolarMutexGuard aGuard; std::unique_ptr<EditTextObject> pMyText(CreateTextObject()); diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 040fda57952c..8eb2ae6a9343 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -43,12 +43,12 @@ namespace frm RichTextControlImpl::RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttrListener, ITextSelectionListener* _pSelectionListener ) :m_pAntiImpl ( _pAntiImpl ) - ,m_pViewport ( NULL ) - ,m_pHScroll ( NULL ) - ,m_pVScroll ( NULL ) - ,m_pScrollCorner ( NULL ) + ,m_pViewport ( nullptr ) + ,m_pHScroll ( nullptr ) + ,m_pVScroll ( nullptr ) + ,m_pScrollCorner ( nullptr ) ,m_pEngine ( _pEngine ) - ,m_pView ( NULL ) + ,m_pView ( nullptr ) ,m_pTextAttrListener ( _pTextAttrListener ) ,m_pSelectionListener ( _pSelectionListener ) ,m_bHasEverBeenShown ( false ) diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 7a3194642b23..265427428873 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -85,7 +85,7 @@ namespace frm void updateAttribute( AttributeId _nAttribute ); /// enables the callback for a particular attribute - void enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener = NULL ); + void enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener = nullptr ); /// disables the change notifications for a particular attribute void disableAttributeNotification( AttributeId _nAttributeId ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 21a9f7f9c6b2..c2faf06964e8 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -516,7 +516,7 @@ namespace frm RichTextEngine* ORichTextModel::getEditEngine( const Reference< XControlModel >& _rxModel ) { - RichTextEngine* pEngine = NULL; + RichTextEngine* pEngine = nullptr; Reference< XUnoTunnel > xTunnel( _rxModel, UNO_QUERY ); OSL_ENSURE( xTunnel.is(), "ORichTextModel::getEditEngine: invalid model!" ); @@ -537,7 +537,7 @@ namespace frm Sequence< sal_Int8 > ORichTextModel::getEditEngineTunnelId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 7d0219e2c3a3..35293e59319b 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -44,7 +44,7 @@ namespace frm RichTextControl::RichTextControl( RichTextEngine* _pEngine, vcl::Window* _pParent, WinBits _nStyle, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener ) :Control( _pParent, implInitStyle( _nStyle ) ) - ,m_pImpl( NULL ) + ,m_pImpl( nullptr ) { implInit( _pEngine, _pTextAttribListener, _pSelectionListener ); } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index c7d9f896f0c1..a1789d4043b4 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -67,7 +67,7 @@ namespace frm If you previously already enabled the notification for this attribute, and specified a different listener, then the previous listener will be replaced with the new listener, provided the latter is not <NULL/>. */ - void enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener = NULL ); + void enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener = nullptr ); /** disables the change notifications for a particular attribute diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index abf83f63ee36..36aeef8101cf 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -24,7 +24,7 @@ namespace frm { RichTextViewPort::RichTextViewPort( vcl::Window* _pParent ) : Control ( _pParent ) - , m_pView(NULL) + , m_pView(nullptr) , m_bHideInactiveSelection( true ) { } diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index 25e172e623bc..ec488e6b8b2d 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -54,7 +54,7 @@ namespace frm private: inline void implInvalidateAttributes() const { - m_aInvalidationHandler.Call( NULL ); + m_aInvalidationHandler.Call( nullptr ); } }; diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index da0d9c4596ad..b4793cbeb94a 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -409,7 +409,7 @@ namespace frm // if the current adjustment of the was the default adjustment for the *previous* text direction, // then we toggle the adjustment, too SvxAdjust eCurrentAdjustment = SVX_ADJUST_LEFT; - const SfxPoolItem* pCurrentAdjustment = NULL; + const SfxPoolItem* pCurrentAdjustment = nullptr; if ( SfxItemState::SET == _rCurrentAttribs.GetItemState( EE_PARA_JUST, true, &pCurrentAdjustment ) ) eCurrentAdjustment = static_cast< const SvxAdjustItem* >( pCurrentAdjustment )->GetAdjust(); diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index f8d4f7a98229..5e61f55dbffa 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -62,19 +62,19 @@ namespace frm }; inline AttributeState::AttributeState( ) - :pItemHandleItem ( NULL ) + :pItemHandleItem ( nullptr ) ,eSimpleState( eIndetermined ) { } inline AttributeState::AttributeState( AttributeCheckState _eCheckState ) - :pItemHandleItem ( NULL ) + :pItemHandleItem ( nullptr ) ,eSimpleState( _eCheckState ) { } inline AttributeState::AttributeState( const AttributeState& _rSource ) - :pItemHandleItem ( NULL ) + :pItemHandleItem ( nullptr ) ,eSimpleState( eIndetermined ) { operator=( _rSource ); @@ -107,7 +107,7 @@ namespace frm if ( _pItem ) pItemHandleItem = _pItem->Clone(); else - pItemHandleItem = NULL; + pItemHandleItem = nullptr; } inline bool AttributeState::operator==( const AttributeState& _rRHS ) diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index bc288a949371..fd9be3973820 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -60,7 +60,7 @@ namespace frm checkDisposed(); - EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : NULL; + EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : nullptr; OSL_ENSURE( pEngine, "OSelectAllDispatcher::dispatch: no edit engine - but not yet disposed?" ); if ( !pEngine ) return; @@ -93,7 +93,7 @@ namespace frm { FeatureStateEvent aEvent( OAttributeDispatcher::buildStatusEvent() ); - EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : NULL; + EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : nullptr; OSL_ENSURE( pEngine, "OParagraphDirectionDispatcher::dispatch: no edit engine - but not yet disposed?" ); if ( pEngine && pEngine->IsVertical() ) aEvent.IsEnabled = sal_False; @@ -115,7 +115,7 @@ namespace frm checkDisposed(); - EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : NULL; + EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : nullptr; OSL_ENSURE( pEngine, "OTextDirectionDispatcher::dispatch: no edit engine - but not yet disposed?" ); if ( !pEngine ) return; @@ -128,7 +128,7 @@ namespace frm { FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() ); - EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : NULL; + EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : nullptr; OSL_ENSURE( pEngine, "OTextDirectionDispatcher::dispatch: no edit engine - but not yet disposed?" ); aEvent.IsEnabled = sal_True; @@ -164,7 +164,7 @@ namespace frm } OSL_FAIL( "OAsianFontLayoutDispatcher::convertDispatchArgsToItem: did not find the one and only argument!" ); - return NULL; + return nullptr; } |