INTEGRATION: CWS aw013 (1.3.196); FILE MERGED

2004/07/02 12:03:40 aw 1.3.196.5: #i29181#
2004/06/29 11:30:37 aw 1.3.196.4: RESYNC: (1.3-1.4); FILE MERGED
2004/06/28 15:03:32 aw 1.3.196.3: #i29181#
2004/06/28 14:54:59 aw 1.3.196.2: #117254#
2004/06/22 15:36:08 aw 1.3.196.1: #i29186#

1 files changed, 13 insertions, 2 deletions

diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 7f3f623925..e5edb64e88 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objectcontactofpageview.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-10 11:33:08 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 14:40:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,6 +135,14 @@ namespace sdr
         {
         }
 
+        // A ViewObjectContact was deleted and shall be forgotten.
+        // #i29181# Overload to clear selection at associated view
+        void ObjectContactOfPageView::RemoveViewObjectContact(ViewObjectContact& rVOContact)
+        {
+            // call parent
+            ObjectContact::RemoveViewObjectContact(rVOContact);
+        }
+
         // Update Draw Hierarchy data. Take care of everything that is inside
         // of rDisplayInfo.GetRedrawArea(), that is the necessary part.
         void ObjectContactOfPageView::EnsureValidDrawHierarchy(DisplayInfo& rDisplayInfo)
@@ -287,6 +295,9 @@ namespace sdr
                 maPreRenderDevice.SetMapMode(pOriginalOutDev->GetMapMode());
             }
 
+            // #i29186#
+            maPreRenderDevice.SetDrawMode(pOriginalOutDev->GetDrawMode());
+
             // replace values at rDisplayInfo for rendering to PreRenderDevice
             pOriginalExtOutDev->SetOutDev(&maPreRenderDevice);
             rDisplayInfo.SetOutputDevice(&maPreRenderDevice);