INTEGRATION: CWS aw046 (1.7.2); FILE MERGED

2007/06/04 08:33:11 fs 1.7.2.6: manual RESYNC: re-merge the changes m210->m213
2007/05/30 14:35:45 aw 1.7.2.5: #i74769# code cleanups
2007/05/21 10:32:44 fs 1.7.2.4: #i74769# moved assertion
2007/05/08 15:44:59 aw 1.7.2.3: #i74769#
2007/04/23 21:59:29 aw 1.7.2.2: RESYNC: (1.7-1.9); FILE MERGED
2007/04/03 10:13:18 aw 1.7.2.1: #i74769# removed ExpandPaintClipRegion

1 files changed, 24 insertions, 31 deletions

diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 95fb6ac185c3..c89831a516c9 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.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2007-05-10 10:09:18 $
+ *  last change: $Author: hr $ $Date: 2007-06-26 12:07:12 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -928,14 +928,11 @@ namespace sdr { namespace contact {
 
 
     //--------------------------------------------------------------------
-    void ViewObjectContactOfUnoControl_Impl::positionControlForPaint( const DisplayInfo& _rDisplayInfo ) const
+    void ViewObjectContactOfUnoControl_Impl::positionControlForPaint( const DisplayInfo& /* #i74769# _rDisplayInfo*/ ) const
     {
         if ( !m_xControl.is() )
             return;
 
-        if ( m_pOutputDeviceForWindow != _rDisplayInfo.GetOutputDevice() )
-            return;
-
         positionAndZoomControl();
     }
 
@@ -1612,11 +1609,8 @@ namespace sdr { namespace contact {
     {
         VOCGuard aGuard( *m_pImpl );
         m_pImpl->ensureControl();
-        Reference< XControl > xControl = m_pImpl->getExistentControl();
-        Reference< XControlModel > xModel;
-        if ( xControl.is() )
-            xModel = xControl->getModel();
-        return xControl;
+
+        return m_pImpl->getExistentControl();
     }
 
     //--------------------------------------------------------------------
@@ -1695,7 +1689,6 @@ namespace sdr { namespace contact {
         }
 
         mbIsPainted = sal_True;
-        mbIsInvalidated = sal_False;
         maPaintedRectangle = pObject->GetLogicRect();
     }
 
@@ -1797,25 +1790,6 @@ namespace sdr { namespace contact {
         OSL_PRECOND( m_pImpl->getExistentControl().is(),
             "UnoControlWindowContact::doPaintObject: the control was said to be non-NULL here!" );
 
-#ifdef DBG_UTIL
-        // The code below is only true because when we paint onto a window, then this is the parent window
-        // of our control. If we ever happen to paint onto a foreign window, then we probably need to
-        // always paint the control, independent from the design mode setting.
-        // However, for the moment we don't need this complete handling, since it always worked in the reduced
-        // way below ...
-        try
-        {
-            Window* pControlWindow = VCLUnoHelper::GetWindow( m_pImpl->getExistentControl()->getPeer() );
-            Window* pControlParentWindow = pControlWindow ? pControlWindow->GetParent() : NULL;
-            DBG_ASSERT( pControlParentWindow == _rDisplayInfo.GetOutputDevice(),
-                "UnoControlWindowContact::doPaintObject: oops. Special handling needed!" );
-        }
-        catch( const Exception& )
-        {
-            OSL_ENSURE( sal_False, "UnoControlWindowContact::doPaintObject: caught an exception while validating the control/output device!" );
-        }
-#endif
-
         // don't paint if there's a "visible control" which paints itself
         bool bVisibleControl = false;
         try
@@ -1836,6 +1810,25 @@ namespace sdr { namespace contact {
         }
         else
         {
+#ifdef DBG_UTIL
+            // We do effectively nothing here in alive mode. This only works because when we paint onto
+            // a window, then this is the parent window of our control. If we ever happen to paint onto
+            // a foreign window *while in alive mode*, then we probably need to always paint the control.
+            // However, for the moment we don't need this complete handling, since it always worked in
+            // the reduced way ...
+            try
+            {
+                Window* pControlWindow = VCLUnoHelper::GetWindow( m_pImpl->getExistentControl()->getPeer() );
+                Window* pControlParentWindow = pControlWindow ? pControlWindow->GetParent() : NULL;
+                DBG_ASSERT( pControlParentWindow == _rDisplayInfo.GetOutputDevice(),
+                    "UnoControlWindowContact::doPaintObject: oops. Special handling needed!" );
+            }
+            catch( const Exception& )
+            {
+                OSL_ENSURE( sal_False, "UnoControlWindowContact::doPaintObject: caught an exception while validating the control/output device!" );
+            }
+#endif
+
             try
             {
                 Reference< XControl > xControl( m_pImpl->getExistentControl() );