summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/docundomanager.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:23:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:38 +0100
commit28034eaf925aa50d379dd5cffccc20d7edc95aec (patch)
tree5cde1f141bc0ffc5cb04a12980d0c4bce69de0f0 /sfx2/source/doc/docundomanager.cxx
parentd930b6c2e6e3dfb9e1ed19b84a3137cc0cfbfd8c (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I7213b49b09ddcb00841aa5f63343baeab0e65fa4
Diffstat (limited to 'sfx2/source/doc/docundomanager.cxx')
-rw-r--r--sfx2/source/doc/docundomanager.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index 1f381af8f98e..d58ec02f2dbc 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -102,7 +102,7 @@ namespace sfx2
{
aUndoHelper.disposing();
ENSURE_OR_RETURN_VOID( pUndoManager, "DocumentUndoManager_Impl::disposing: already disposed!" );
- pUndoManager = NULL;
+ pUndoManager = nullptr;
}
void invalidateXDo_nolck();
@@ -110,9 +110,9 @@ namespace sfx2
private:
static IUndoManager* impl_retrieveUndoManager( SfxBaseModel& i_baseModel )
{
- IUndoManager* pUndoManager( NULL );
+ IUndoManager* pUndoManager( nullptr );
SfxObjectShell* pObjectShell = i_baseModel.GetObjectShell();
- if ( pObjectShell != NULL )
+ if ( pObjectShell != nullptr )
pUndoManager = pObjectShell->GetUndoManager();
if ( !pUndoManager )
throw NotInitializedException( OUString(), *&i_baseModel );
@@ -123,13 +123,13 @@ namespace sfx2
::svl::IUndoManager& DocumentUndoManager_Impl::getImplUndoManager()
{
- ENSURE_OR_THROW( pUndoManager != NULL, "DocumentUndoManager_Impl::getImplUndoManager: no access to the doc's UndoManager implementation!" );
+ ENSURE_OR_THROW( pUndoManager != nullptr, "DocumentUndoManager_Impl::getImplUndoManager: no access to the doc's UndoManager implementation!" );
#if OSL_DEBUG_LEVEL > 0
// in a non-product build, assert if the current UndoManager at the shell is not the same we obtained
// (and cached) at construction time
SfxObjectShell* pObjectShell = rAntiImpl.getBaseModel().GetObjectShell();
- OSL_ENSURE( ( pObjectShell != NULL ) && ( pUndoManager == pObjectShell->GetUndoManager() ),
+ OSL_ENSURE( ( pObjectShell != nullptr ) && ( pUndoManager == pObjectShell->GetUndoManager() ),
"DocumentUndoManager_Impl::getImplUndoManager: the UndoManager changed meanwhile - what about our listener?" );
#endif
@@ -148,7 +148,7 @@ namespace sfx2
SfxModelGuard aGuard( rAntiImpl );
const SfxObjectShell* pDocShell = getObjectShell();
- ENSURE_OR_THROW( pDocShell != NULL, "lcl_invalidateUndo: no access to the doc shell!" );
+ ENSURE_OR_THROW( pDocShell != nullptr, "lcl_invalidateUndo: no access to the doc shell!" );
SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst( pDocShell );
while ( pViewFrame )
{