[HELP] fdo#47707 PRINTING: Printing windows wrong color indication

Hi,

I have searched for the problem of fdo#47707. And I think I found it, 
but I have some questions.
I have attached a diff. When I know I have the correct solution I'll 
submit it to gerrit.

docshel4.cxx -> getPrinter-function: I don't know why this exists. It is 
called when you insert a picture in impress. I don't know if ever 
another drawmode is used then the default drawmode in that function. But 
I think the change will also need to happen there, although I'm not sure.

The Black&White-option would be useful in my opinion when it prints 
pictures but no the background. But I can't turn on the one without the 
other (both are set with the DRAWMODE_WHITEBITMAP-define). So I think 
then all pictures should be turned off otherwise it hardly is different 
from grayscale.

--
Greetings,
Rob Snelders

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 5b0d4c5..033a66f 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -129,9 +129,9 @@ SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate)
         sal_uLong nMode = DRAWMODE_DEFAULT;
 
         if( nQuality == 1 )
-            nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | 
DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT;
+            nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | 
DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT;
         else if( nQuality == 2 )
-            nMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEFILL | 
DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT;
+            nMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL | DRAWMODE_BLACKTEXT | 
DRAWMODE_WHITEBITMAP | DRAWMODE_WHITEGRADIENT;
 
         mpPrinter->SetDrawMode( nMode );
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 794e4ab..6fcb1c3 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1506,13 +1506,13 @@ private:
             {
                 case 1:
                     aInfo.mnDrawMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL
-                        | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP
+                        | DRAWMODE_GRAYTEXT | DRAWMODE_GRAYBITMAP
                         | DRAWMODE_GRAYGRADIENT;
                     break;
 
                 case 2:
-                    aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT
-                        | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP
+                    aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL
+                        | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP
                         | DRAWMODE_WHITEGRADIENT;
                     break;