diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:10:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:10:01 +0000 |
| commit | f3a24adbf9983c2cbaf4d6b22a79c57834707824 (patch) | |
| tree | 8787d80926ffe96e8edea85ad67728de5f21903e | |
| parent | 14456957222d86432e299ad9ed2ff94cb6394310 (diff) | |
INTEGRATION: CWS os30 (1.26.6); FILE MERGED
2004/05/24 14:02:23 os 1.26.6.1: #116788# Crash on access to invalid SID_ATTR_BRUSH item fixed
| -rw-r--r-- | svx/source/dialog/backgrnd.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/dialog/backgrnd.cxx b/svx/source/dialog/backgrnd.cxx index 23edaec15794..fe0048201188 100644 --- a/svx/source/dialog/backgrnd.cxx +++ b/svx/source/dialog/backgrnd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: backgrnd.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2004-05-10 16:49:27 $ + * last change: $Author: rt $ $Date: 2004-06-17 16:10:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -681,8 +681,10 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_BRUSH ); if ( rSet.GetItemState( nWhich, FALSE ) >= SFX_ITEM_AVAILABLE ) + { pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); - pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr); + pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr); + } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); SfxItemState eState = rSet.GetItemState( nWhich, TRUE ); |