diff options
| author | Frank Schönheit <fs@openoffice.org> | 2010-01-20 18:45:26 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2010-01-20 18:45:26 +0000 |
| commit | b381391e5d2ce79470b813cd11fdfbdea2ccc7c1 (patch) | |
| tree | 25f3597bed25e7eaf8ba357e0bc0c2a62cfe2530 /svx | |
| parent | 4f84f920c1256125ab3a1073bcf5037deb3cb6ff (diff) | |
reverting the fix for #i108325#, which caused #i108423#. Adding another, less invasive workaround. Still not the final solution, which is covered by issue 108357
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 5d00418a5729..531938b4a482 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -237,6 +237,8 @@ namespace sdr { namespace contact { void invalidate() const; + void invalidate() const; + public: inline const Reference< XControl >& getControl() const { return m_xControl; } }; @@ -306,6 +308,15 @@ namespace sdr { namespace contact { } //-------------------------------------------------------------------- + void ControlHolder::invalidate() const + { + Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() ); + OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" ); + if ( pWindow ) + pWindow->Invalidate(); + } + + //-------------------------------------------------------------------- ::basegfx::B2DVector ControlHolder::getZoom() const { // no check whether we're valid, this is the responsibility of the caller @@ -1689,6 +1700,9 @@ namespace sdr { namespace contact { if ( !bHadControl && rControl.is() && rControl.isVisible() ) rControl.invalidate(); + if ( !bHadControl && rControl.is() && rControl.isVisible() ) + rControl.invalidate(); + // check if we already have an XControl. if ( !xControlModel.is() || !rControl.is() ) // use the default mechanism. This will create a ControlPrimitive2D without |