diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-01-30 20:38:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-30 20:38:00 +0000 |
commit | 1eac75fc6294878c0439cbb6c190b6fa6eac8213 (patch) | |
tree | 6092d1f003c96c02c15e032604d01b96fdf45080 | |
parent | 5dbe8b76ecfd53189a6e8bb0c4bb9378213c62b5 (diff) |
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 :-(
-rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 0fb9515ff0f7..e9bde505a0da 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: */ |