diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 17:47:31 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:26:07 +0100 |
| commit | e218bbcbf60345115772ccb2fa63418c13895bd0 (patch) | |
| tree | 29d9fb87ba270b6e5464b1440fb931868d4e3f4a /svx/source/sdr/contact | |
| parent | b129ee5021b7f56dfd936d53a46d274880edc0a9 (diff) | |
Move OutputDevice members to VclPtr: starmath, svx.
Change-Id: I1a5174334f41bc319e0806b9d324be64ba6d0135
Diffstat (limited to 'svx/source/sdr/contact')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index c59fdb2eafa2..1ad7f6e13f6b 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -521,7 +521,7 @@ namespace sdr { namespace contact { Reference< XContainer > m_xContainer; /// the output device for which the control was created - const OutputDevice* m_pOutputDeviceForWindow; + VclPtr<OutputDevice> m_pOutputDeviceForWindow; /// flag indicating whether the control is currently visible bool m_bControlIsVisible; @@ -1038,7 +1038,7 @@ namespace sdr { namespace contact { if ( m_aControl.is() ) { - if ( m_pOutputDeviceForWindow == &_rDevice ) + if ( m_pOutputDeviceForWindow.get() == const_cast<OutputDevice *>( &_rDevice ) ) return true; // Somebody requested a control for a new device, which means either of @@ -1062,7 +1062,7 @@ namespace sdr { namespace contact { if ( !createControlForDevice( _rPageView, _rDevice, *pUnoObject, _rInitialViewTransformation, m_aZoomLevelNormalization, aControl ) ) return false; - m_pOutputDeviceForWindow = &_rDevice; + m_pOutputDeviceForWindow = const_cast< OutputDevice * >( &_rDevice ); m_aControl = aControl; m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY); DBG_ASSERT( ( m_xContainer.is() // either have a XControlContainer |