diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 13:52:45 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 13:52:45 +0000 |
| commit | b26df4f446a0d3e8922c18efa8afd34105534211 (patch) | |
| tree | 2c12c843b5178ca2c210a08c5419dc58cc05b84f /svx | |
| parent | f32a1d2b300c85befd3398e15dd77fc864031871 (diff) | |
INTEGRATION: CWS aw053 (1.12.82); FILE MERGED
2007/11/01 22:16:29 aw 1.12.82.2: RESYNC: (1.12-1.13); FILE MERGED
2007/09/14 10:37:09 aw 1.12.82.1: #i80528# Removal of draft paint modes
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index e2b58d249a64..383c1c7b2b33 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewobjectcontactofunocontrol.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: ihi $ $Date: 2007-11-21 15:29:03 $ + * last change: $Author: ihi $ $Date: 2007-11-26 14:52:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1363,28 +1363,7 @@ namespace sdr { namespace contact { return; const Rectangle& rPaintRect( pUnoObject->GetLogicRect() ); - - SdrPageView* pPageView = _rDisplayInfo.GetPageView(); - if ( pPageView && pPageView->GetView().IsFillDraft() ) - { - XOutputDevice* pExtendedDevice( _rDisplayInfo.GetExtendedOutputDevice() ); - if ( pExtendedDevice ) - { - const SfxItemSet& rSet = pUnoObject->GetProperties().GetObjectItemSet(); - - // perepare ItemSet to avoid old XOut filling - SfxItemSet aFillDescriptor( *rSet.GetPool() ); - aFillDescriptor.Put( XFillStyleItem( XFILL_NONE ) ); - pExtendedDevice->SetFillAttr( aFillDescriptor ); - pExtendedDevice->SetLineAttr( rSet ); - - pExtendedDevice->DrawRect( rPaintRect ); - } - } - else - { - UnoControlContactHelper::drawControl( m_xControl, rPaintRect.TopLeft(), _rDisplayInfo.GetOutputDevice() ); - } + UnoControlContactHelper::drawControl( m_xControl, rPaintRect.TopLeft(), _rDisplayInfo.GetOutputDevice() ); } //-------------------------------------------------------------------- |