diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-01-15 04:03:41 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-01-15 04:05:22 +0100 |
| commit | 3a48ab62279572673cdc385a81a3e728f16d2a6d (patch) | |
| tree | fce0f93c9fd1df6bb6a9e65f2bca1bab5b52f5c9 | |
| parent | f3950ef403ee95dbf719f3743bfea6e4fc5c6cef (diff) | |
fix crash related to accessing null element in boost::ptr_vector
| -rw-r--r-- | svx/source/items/clipfmtitem.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 24f550cc8125..a43f889c08f4 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -164,8 +164,7 @@ sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const const String& SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const { - const String* pS = &(pImpl->aFmtNms[nPos]); - return pS ? *pS : SvxClipboardFmtItem_Impl::sEmptyStr; + return pImpl->aFmtNms.is_null(nPos) ? SvxClipboardFmtItem_Impl::sEmptyStr : pImpl->aFmtNms[nPos]; } |