[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

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

New commits:
commit 8ba7647aba605ee7025ef9f301c2c9d8eb1c515f
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri May 15 09:40:04 2015 +0100

    restore missing frame borders
    
    regression from...
    
    commit 61eb53d39a8d90167dc5599c2a2092626788a630
    Author: Noel Grandin <n...@peralex.com>
    Date:   Fri May 8 15:40:06 2015 +0200
    
        convert FRAME_DRAW constants to scoped enum
    
        Change-Id: I98e52aa56ec063ecc8f3d10baef65eb293c726bf
    
    Change-Id: Id10cadc5e1fdefb4b2bcd3aefff4f0dba9cbd973

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index ca26498..baba1e4 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -653,7 +653,7 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& 
rRect,
     if( nStyle != DrawFrameStyle::NWF &&
         pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) )
     {
-        ImplControlValue aControlValue( static_cast<long>(nStyle) |
+        ImplControlValue aControlValue( static_cast<long>(nStyle) | 
static_cast<long>(nFlags) |
                                         
static_cast<long>(pWin->GetType()==WINDOW_BORDERWINDOW ?
                                                           
DrawFrameFlags::BorderWindowBorder : DrawFrameFlags::NONE) );
         Rectangle aBound, aContent;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits