[Libreoffice-commits] .: Branch 'libreoffice-3-3' - cui/source

[David Tardon]

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

New commits:
commit adbc618d68569d5b63d1ec87c5d7a9d7f5ba5761
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 :-(
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 1f88895..d9a02c3 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1930,7 +1930,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();
@@ -1941,8 +1944,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
             DBG_ERROR("AutoWidth/AutoHeight should be enabled");
         }
     }
-    else
-        m_bIsMultiSelection = true;
+#endif
 
     // use page offset and recalculate
     Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() );