[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

[Ivan Timofeev]

 vcl/source/window/decoview.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c699bef4129d972ea2f7015d9b682248eb39dff2
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Wed Jul 4 22:44:08 2012 +0400

    fix drawing of calc input line when vcl backend supports CTRL_FRAME
    
    it is counterintuitive, but FRAME_DRAW_NWF was introduced to shrink a draw
    rectangle on its way, regardless of native CTRL_FRAME support
    (see d02e19e3d8697132f63eca353047a572b1e459ea).
    And that is what we want for the calc input line.
    
    Change-Id: Ie2f8bc6e2e21a56b081b8c71cc2b642b8f05848f
    (cherry picked from commit 504e433331016004fb2edebdb29a85d69084b1d6)

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 3e85e2e..c91a1d0 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -663,7 +663,8 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect,
          bFlatBorders )
         nStyle |= FRAME_DRAW_MONO;
 
-    if( pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) )
+    if( !(nStyle & FRAME_DRAW_NWF) &&
+        pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) )
     {
         ImplControlValue aControlValue( nStyle |
                                         (pWin->GetType()==WINDOW_BORDERWINDOW ?