[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/tabpages/swpossizetabpage.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 69aadc54a50352f69457899c176286d3ac66ca7d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 30 20:38:00 2011 +0000

    Resolves: rhbz#673819 crash on changing position of drawing object in header
    
    The header/footer objects are cunning wrappers to pretend to some parts
    of the drawing stuff that there are multiple objects, while in reality
    there is only one. So call HasText actually gets a totally different
    object from the cast :-(

diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index ee3add0..9955420 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1876,7 +1876,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
     }
 
     // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE
-    if( rMarkList.GetMarkCount() == 1 )
+    if( rMarkList.GetMarkCount() != 1 )
+        m_bIsMultiSelection = true;
+#if OSL_DEBUG_LEVEL > 1
+    else
     {
         const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
         SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
@@ -1887,8 +1890,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
             DBG_ERROR("AutoWidth/AutoHeight should be enabled");
         }
     }
-    else
-        m_bIsMultiSelection = true;
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */