diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 13:46:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 13:46:28 +0000 |
| commit | a50bec2f7460ce16b23d2b42d5e9fc165d7d52af (patch) | |
| tree | bfd4cb8ad3e60a401bfd24cd016d32eec1ffea17 /svx/source/sdr/contact/viewcontactofunocontrol.cxx | |
| parent | 021e8508f3d0251245fc20cea581f7f08d51ff5b (diff) | |
INTEGRATION: CWS controlperformance (1.9.112); FILE MERGED
2008/03/28 13:21:42 fs 1.9.112.1: #b6673211#: getUnoControlForDevice is unused / use the new isControlVisible at the VOC
Diffstat (limited to 'svx/source/sdr/contact/viewcontactofunocontrol.cxx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofunocontrol.cxx | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 901dff2cf0..ea7a3f26ab 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewcontactofunocontrol.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -104,23 +104,6 @@ namespace sdr { namespace contact { } //-------------------------------------------------------------------- - Reference< XControl > ViewContactOfUnoControl::getUnoControlForDevice( const OutputDevice* _pDevice, const SdrUnoObjAccessControl& ) const - { - sal_uInt32 vocCount = maVOCList.Count(); - for ( sal_uInt32 voc = 0; voc < vocCount; ++voc ) - { - ViewObjectContactOfUnoControl* pUCVOC = dynamic_cast< ViewObjectContactOfUnoControl* >( maVOCList.GetObject( voc ) ); - DBG_ASSERT( pUCVOC, "ViewContactOfUnoControl::getUnoControlForDevice: wrong ViewObjectContact type!" ); - if ( !pUCVOC ) - continue; - - if ( pUCVOC->belongsToDevice( _pDevice ) ) - return pUCVOC->getControl(); - } - return Reference< XControl >(); - } - - //-------------------------------------------------------------------- Reference< XControl > ViewContactOfUnoControl::getTemporaryControlForWindow( const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const { @@ -208,18 +191,7 @@ namespace sdr { namespace contact { // in alive mode, don't paint if the control is not visible. // #i82791# - bool bIsVisible = true; - try - { - Reference< XWindow2 > xControlWindow( rVOC.getExistentControl(), UNO_QUERY ); - if ( xControlWindow.is() ) - bIsVisible = xControlWindow->isVisible(); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - return bIsVisible; + return rVOC.isControlVisible(); } //........................................................................ |