diff options
| author | obo <obo@openoffice.org> | 2011-03-16 13:51:10 +0100 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2011-03-16 13:51:10 +0100 |
| commit | d306dd4172f0e849729f35988e9d90df624e5fba (patch) | |
| tree | bd61c0bf3f626ae99c37282a36a962ea5fc8f42a | |
| parent | aa851f995545620803fdac27de287f0ade58e68e (diff) | |
masterfix DEV300: #i117352#,#i10000# WaE converting to non-pointer type sal_uInt16 from NULLooo/DEV300_m103
| -rw-r--r-- | svl/source/undo/undo.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 89d5f32bb6..cf09992887 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -711,7 +711,7 @@ sal_uInt16 SfxUndoManager::GetUndoActionId() const DBG_ASSERT( m_pData->pActUndoArray->nCurUndoAction > 0, "svl::SfxUndoManager::GetUndoActionId(), illegal id!" ); if ( m_pData->pActUndoArray->nCurUndoAction == 0 ) - return NULL; + return 0; return m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction->GetId(); } |