summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-07-31 15:37:24 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-07-31 15:37:24 +0000
commit8a465d3f5f72f28b7e9403839aa42b401920cd7d (patch)
treec6d9f5cbc2868fdef1b1ad29ffce5ec75eb042f1 /sc
parent945e2b2511b59397a060a3805b517594fbd38802 (diff)
INTEGRATION: CWS calc43 (1.25.10); FILE MERGED
2007/07/18 14:16:59 nn 1.25.10.1: #i76114# PrePrintDrawingLayer: set MapMode, disable region intersecting
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/output3.cxx16
1 files changed, 13 insertions, 3 deletions
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 3a2bd80aea40..94771e4efa2f 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: output3.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: hr $ $Date: 2007-06-26 11:52:21 $
+ * last change: $Author: hr $ $Date: 2007-07-31 16:37:24 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -122,10 +122,20 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY )
if(pLocalDrawView)
{
+ // #i76114# MapMode has to be set because BeginDrawLayers uses GetPaintRegion
+ MapMode aOldMode = pDev->GetMapMode();
+ if (!bMetaFile)
+ pDev->SetMapMode( MapMode( MAP_100TH_MM, aMMOffset, aOldMode.GetScaleX(), aOldMode.GetScaleY() ) );
+
// #i74769# work with SdrPaintWindow directly
+ // #i76114# pass bDisableIntersect = true, because the intersection of the table area
+ // with the Window's paint region can be empty
Region aRectRegion(aRect);
- mpTargetPaintWindow = pLocalDrawView->BeginDrawLayers(pDev, aRectRegion);
+ mpTargetPaintWindow = pLocalDrawView->BeginDrawLayers(pDev, aRectRegion, true);
OSL_ENSURE(mpTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)");
+
+ if (!bMetaFile)
+ pDev->SetMapMode( aOldMode );
}
}