[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Noel Grandin]

 vcl/inc/unx/kde/kdedata.hxx          |    4 ++--
 vcl/unx/kde/salnativewidgets-kde.cxx |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 5c9e999859932235c2cf172f3dc968c80af3a0ca
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Oct 9 09:41:29 2015 +0200

    fix KDE3 build
    
    after my commit 0e30af6fdc496ee1b935d68e979aa63729cef878
    "convert SAL_FRAME_STYLE to scoped enum"
    
    Change-Id: Iefa1b9a39a50ea09fb6a2615196a8adcea40df0d

diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index e2d28de..e6bc5b1 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -59,7 +59,7 @@ class KDESalFrame : public X11SalFrame
     GraphicsHolder m_aGraphics[ nMaxGraphics ];
 
 public:
-    KDESalFrame( SalFrame* pParent, sal_uLong );
+    KDESalFrame( SalFrame* pParent, SalFrameStyleFlags );
     virtual ~KDESalFrame();
 
     virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
@@ -75,7 +75,7 @@ public:
     KDESalInstance( SalYieldMutex* pMutex )
             : X11SalInstance( pMutex ) {}
     virtual ~KDESalInstance() {}
-    virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
+    virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
 
     virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; }
 
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 105c3e6..7653f5b 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1725,7 +1725,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
 
 // KDESalFrame implementation
 
-KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) :
+KDESalFrame::KDESalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) :
     X11SalFrame( pParent, nStyle )
 {
 }
@@ -2096,8 +2096,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder()
 
 // KDESalInstance implementation
 
-SalFrame *
-KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle )
+SalFrame * KDESalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nStyle )
 {
     return new KDESalFrame( pParent, nStyle );
 }