summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-03-30 14:38:01 +0000
committerRüdiger Timm <rt@openoffice.org>2004-03-30 14:38:01 +0000
commit2356f49390d01409a3f9acad54fddb159e070257 (patch)
treee9013ff97d64c885a661f7290236a740a4869b72
parentf468607ec91b122ff398f439ef997bd4ac731e8e (diff)
INTEGRATION: CWS interop12 (1.2.28); FILE MERGED
2004/03/17 10:04:57 cl 1.2.28.3: RESYNC: (1.2-1.3); FILE MERGED 2004/01/15 12:05:47 aw 1.2.28.2: #i20949# corrections for SetProcessedPage() mechanism 2003/12/12 09:40:48 aw 1.2.28.1: #i20479# Changes for allowing CL to access the PaintInfo of the currently painting parts.
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpage.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 2d31f887c0a2..e77cd29ebad9 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewcontactofsdrpage.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: kz $ $Date: 2004-02-26 17:47:40 $
+ * last change: $Author: rt $ $Date: 2004-03-30 15:38:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -185,6 +185,9 @@ namespace sdr
// Pre- and Post-Paint this object. Is used e.g. for page background/foreground painting.
void ViewContactOfSdrPage::PrePaintObject(DisplayInfo& rDisplayInfo, const ViewObjectContact& rAssociatedVOC)
{
+ // Make processed page accessible from SdrPageView via DisplayInfo
+ rDisplayInfo.SetProcessedPage(&GetSdrPage());
+
// test for page painting
if(!rDisplayInfo.GetControlLayerPainting() && rDisplayInfo.GetPagePainting())
{
@@ -259,6 +262,9 @@ namespace sdr
}
}
}
+
+ // Reset processed page at DisplayInfo and DisplayInfo at SdrPageView
+ rDisplayInfo.SetProcessedPage(0L);
}
void ViewContactOfSdrPage::DrawPaper(DisplayInfo& rDisplayInfo)