[Libreoffice-commits] .: svx/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Jan 17 05:11:04 PST 2012


 svx/source/items/clipfmtitem.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit eb9054fbe9d13978862dab8d13923bf670e96c43
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 17 13:10:11 2012 +0000

    fix crash double clicking rotated text in calc

diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index a43f889..77273b3 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;


More information about the Libreoffice-commits mailing list