diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-17 13:10:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-17 13:10:36 +0000 |
| commit | eb9054fbe9d13978862dab8d13923bf670e96c43 (patch) | |
| tree | 70a8a497d0ae59a238b2cd73ee8c21c442a295f7 /svx/source/items | |
| parent | a47cb498471f38987c248519435bc4867ffa456e (diff) | |
fix crash double clicking rotated text in calc
Diffstat (limited to 'svx/source/items')
| -rw-r--r-- | svx/source/items/clipfmtitem.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index a43f889c08f4..77273b367dd1 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -112,13 +112,11 @@ int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const return 0; int nRet = 1; - const String* pStr1, *pStr2; for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.size(); n < nEnd; ++n ) { if( pImpl->aFmtIds[ n ] != rCmp.pImpl->aFmtIds[ n ] || - ( (0 == ( pStr1 = &(pImpl->aFmtNms[n]) )) ^ - (0 == ( pStr2 = &(rCmp.pImpl->aFmtNms[n]) ) )) || - ( pStr1 && *pStr1 != *pStr2 )) + ( pImpl->aFmtNms.is_null(n) ^ rCmp.pImpl->aFmtNms.is_null(n) ) || + ( !pImpl->aFmtNms.is_null(n) && pImpl->aFmtNms[n] != rCmp.pImpl->aFmtNms[n] ) ) { nRet = 0; break; |