From bcbb20b0efc608653bd680565542f5d804755c8f Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Tue, 3 Sep 2013 11:57:24 -0700 Subject: [PATCH] Print images in grayscale when printing using the "Black & White". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Black and white color option found in Impress at File-->Print-->Libreoffice Impress tab Before change, images are printed in pure white, and hence missing from the printouts. Should resolve bug 62838, and is contributed under the LGPLv3+ / MPL. Change-Id: I29e291c2f2baf95b5725b862625f6a206e4cb8ba Reviewed-on: https://gerrit.libreoffice.org/5798 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/ui/docshell/docshel4.cxx | 4 ++-- sd/source/ui/view/DocumentRenderer.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 5fa8a7669f28..839c7618b2f6 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -116,11 +116,11 @@ SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate) sal_uInt16 nQuality = aPrintItem.GetOptionsPrint().GetOutputQuality(); sal_uLong nMode = DRAWMODE_DEFAULT; - + // 1 == Grayscale, 2 == Black & White (with grayscale images) if( nQuality == 1 ) nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; else if( nQuality == 2 ) - nMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP | DRAWMODE_WHITEGRADIENT; + nMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT; mpPrinter->SetDrawMode( nMode ); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index b98b55a0e0fb..89141cd0a8c6 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1507,15 +1507,15 @@ private: switch (mpOptions->GetOutputQuality()) { - case 1: + case 1: // Grayscale aInfo.mnDrawMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; break; - case 2: + case 2: // Black & White aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL - | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP + | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT; break;