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

[Thorsten Behrens]

 vcl/source/window/decoview.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit ab216f7039d473a4e7b6c08d868d4dc376161539
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue May 19 14:32:04 2015 +0200

    Accomodate gcc 4.2's inabilities to cope with complex templates.
    
    Change-Id: I0a35849a02e3f185783c261a369052594583b082

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