diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 12:03:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 14:06:33 +0100 |
commit | df4bd415c0ceb8e69f8bbeeca554a1c55eb978b7 (patch) | |
tree | 161a658a1d810bda5e539a0edcc7016d8bc1a606 /sw/source/ui | |
parent | a93ef22ada8762dbcaf90751b69244f93afaad03 (diff) |
fix crashing on exit in static SvxBrushItem dtor
site of first ctor
Change-Id: I3316e91bc54439b74df30fdf02ff264a39489c29
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 6e0a027459b7..31b53dae3788 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -193,7 +193,7 @@ SectRepr::SectRepr( sal_uInt16 nPos, SwSection& rSect ) if( pFmt ) { m_Col = pFmt->GetCol(); - m_Brush = pFmt->GetBackground(); + m_Brush = pFmt->makeBackgroundBrushItem(); m_FtnNtAtEnd = pFmt->GetFtnAtTxtEnd(); m_EndNtAtEnd = pFmt->GetEndAtTxtEnd(); m_Balance.SetValue(pFmt->GetBalancedColumns().GetValue()); @@ -764,7 +764,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) if( pFmt->GetCol() != pRepr->GetCol() ) pSet->Put( pRepr->GetCol() ); - if( pFmt->GetBackground(false) != pRepr->GetBackground() ) + SvxBrushItem aBrush(pFmt->makeBackgroundBrushItem(false)); + if( aBrush != pRepr->GetBackground() ) pSet->Put( pRepr->GetBackground() ); if( pFmt->GetFtnAtTxtEnd(false) != pRepr->GetFtnNtAtEnd() ) |