summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-08-11 19:48:40 +0200
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-08-11 19:48:40 +0200
commitcf1ed90aa1f04790fc6e71531d100c086a6f1e95 (patch)
treee416a2cde39cbf05ccc04ab91aea6fbc1483dace
parent9ce8b6ac09c3828a7c5a366cbf9b0dac5c864395 (diff)
DON'T MERGE: more work needed.
Change-Id: Id3cb2f0146ffec4b4bd3ae2f06690e1cde8182b1
-rw-r--r--sc/source/ui/view/printfun.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 129486f07c0b..072cfd930eff 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -548,7 +548,8 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
if (!bMetaFile && pViewData)
pDev->SetMapMode(aMode);
- aOutputData.DrawBackground();
+ // TODO: Probably wrong -- update this.
+ aOutputData.DrawBackground(MAP_PIXEL);
aOutputData.DrawShadow();
aOutputData.DrawFrame();
aOutputData.DrawStrings();
@@ -562,8 +563,8 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
{
if (!bMetaFile && pViewData)
pDev->SetMapMode(aMode);
-
- aOutputData.DrawGrid( true, false ); // no page breaks
+ // TODO: Same mapping issue
+ aOutputData.DrawGrid( true, false, MAP_PIXEL ); // no page breaks
pDev->SetLineColor( COL_BLACK );
@@ -1603,8 +1604,9 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
aOutputData.SetRefDevice( pRefDev );
}
+ // TODO: I don't think we're using the right map mode here?
if( aTableParam.bCellContent )
- aOutputData.DrawBackground();
+ aOutputData.DrawBackground(MAP_PIXEL);
pDev->SetClipRegion(Region(Rectangle(
aPos, Size(aOutputData.GetScrW(), aOutputData.GetScrH()))));
@@ -1619,7 +1621,8 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
if (aTableParam.bGrid)
- aOutputData.DrawGrid( true, false ); // no page breaks
+ // TODO: again
+ aOutputData.DrawGrid( true, false, MAP_PIXEL ); // no page breaks
aOutputData.AddPDFNotes(); // has no effect if not rendering PDF with notes enabled