Return proper transparency value even for ignore_color.

Rather unexpectedly, calling setupOutDevState() with IGNORE_COLOR does not return a proper transparency, but null. Fixed now.

Return proper transparency value even for ignore_color.
Rather unexpectedly, calling setupOutDevState() with IGNORE_COLOR does not return a proper transparency, but null. Fixed now.
4b475f31 · Thorsten Behrens · ac2eaaab · 4b475f31
Kaydet (Commit) 4b475f31 authored Mar 06, 2012 tarafından Thorsten Behrens
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

canvashelper.cxx canvas/source/vcl/canvashelper.cxx +12 -12

No files found.
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1270,21 +1270,21 @@ namespace vclcanvas
                p2ndOutDev->SetClipRegion( aClipRegion );
        }
-        if( eColorType != IGNORE_COLOR )
+        Color aColor( COL_WHITE );
-        {
-            Color aColor( COL_WHITE );
-            if( renderState.DeviceColor.getLength() > 2 )
+        if( renderState.DeviceColor.getLength() > 2 )
-            {
+        {
-                aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
+            aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
-                    renderState.DeviceColor );
+                renderState.DeviceColor );
-            }
+        }
-            // extract alpha, and make color opaque
+        // extract alpha, and make color opaque
-            // afterwards. Otherwise, OutputDevice won't draw anything
+        // afterwards. Otherwise, OutputDevice won't draw anything
-            nTransparency = aColor.GetTransparency();
+        nTransparency = aColor.GetTransparency();
-            aColor.SetTransparency(0);
+        aColor.SetTransparency(0);
+        if( eColorType != IGNORE_COLOR )
+        {
            switch( eColorType )
            {
                case LINE_COLOR: