diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2009-12-07 14:11:32 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2009-12-07 14:11:32 +0100 |
| commit | f2c9ce11be8fa212009957bfe3ef3554a7091b3d (patch) | |
| tree | cabc556fed653f68ce8a2c3cde4934a6daeb81da /sc/source | |
| parent | cc3e9ea68d4f35dec05038a4deaf5e8c16a4db1c (diff) | |
#i104312# fixed print objetcs for pictures and graphics; nopw works for drawing objects as well and does not effect form controls
Diffstat (limited to 'sc/source')
| -rwxr-xr-x[-rw-r--r--] | sc/source/ui/view/gridwin3.cxx | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | sc/source/ui/view/output3.cxx | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | sc/source/ui/view/printfun.cxx | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 5d87806076ab..8d4ad7cf2e8f 100644..100755 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -215,6 +215,7 @@ void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, UL pDrView->setHideOle(!bDrawOle); pDrView->setHideChart(!bDrawChart); pDrView->setHideDraw(!bDrawDraw); + pDrView->setHideFormControl(!bDrawDraw); } if(SC_UPDATE_CHANGED == eMode) diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 648573bbb21c..9555cdee50e1 100644..100755 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -170,7 +170,8 @@ void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOf if(pLocalDrawView) { - bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart() && pLocalDrawView->getHideDraw(); + bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart() + && pLocalDrawView->getHideDraw() && pLocalDrawView->getHideFormControl(); } } diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 4a122e5529db..9c8b1f1d4ce6 100644..100755 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1648,7 +1648,8 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, // test if all paint parts are hidden, then a paint is not necessary at all const Point aMMOffset(aOutputData.PrePrintDrawingLayer(nLogStX, nLogStY)); - const bool bHideAllDrawingLayer(pDrawView && pDrawView->getHideOle() && pDrawView->getHideChart() && pDrawView->getHideDraw()); + const bool bHideAllDrawingLayer( pDrawView && pDrawView->getHideOle() && pDrawView->getHideChart() + && pDrawView->getHideDraw() && pDrawView->getHideFormControl() ); if(!bHideAllDrawingLayer) { @@ -2129,6 +2130,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO pDrawView->setHideOle(!aTableParam.bObjects); pDrawView->setHideChart(!aTableParam.bCharts); pDrawView->setHideDraw(!aTableParam.bDrawings); + pDrawView->setHideFormControl(!aTableParam.bDrawings); } if ( pPrinter && bDoPrint ) |