diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/checklbx.cxx | 9 | ||||
| -rw-r--r-- | svx/source/items/svxitems.src | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 06730c4bf6..2e070cacdd 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -212,7 +212,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) { - Point aPnt = rMEvt.GetPosPixel(); + const Point aPnt = rMEvt.GetPosPixel(); SvLBoxEntry* pEntry = GetEntry( aPnt ); if ( pEntry ) @@ -230,6 +230,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) { ToggleCheckButton( pEntry ); SvTreeListBox::MouseButtonDown( rMEvt ); + + // check if the entry below the mouse changed during the base method call. This is possible if, + // for instance, a handler invoked by the base class tampers with the list entries. + const SvLBoxEntry* pNewEntry = GetEntry( aPnt ); + if ( pNewEntry != pEntry ) + return; + if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) ) CheckButtonHdl(); return; diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index d70e69ea99..77ef840d60 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -32,7 +32,7 @@ StringArray RID_ATTR_NAMES { - ItemList = + ItemList [ en-US ] = { < "Scale" ; SID_ATTR_ZOOM ; > ; < "Brush" ; SID_ATTR_BRUSH ; > ; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8b5004334e..4eaa22e866 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -708,6 +708,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& // next entry ++aSrcIt; } + const_cast< SvxItemPropertySet& >(rPropSet).ClearAllUsrAny(); } } |