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

Noel Grandin noel at peralex.com
Mon Oct 5 00:59:05 PDT 2015


 vcl/unx/kde4/KDESalInstance.cxx |    2 +-
 vcl/unx/kde4/KDESalInstance.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3dae60c3a8c6de7cd776e7b832f7b55688716150
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Oct 5 09:22:13 2015 +0200

    fix KDE4 build
    
    Change-Id: Idb101b5b5d40b6a1a54acda81be5a5f2c09722bb

diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index 094cd20..e28fb2d 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.cxx
@@ -26,7 +26,7 @@
 
 using namespace com::sun::star;
 
-SalFrame* KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nState )
+SalFrame* KDESalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nState )
 {
     return new KDESalFrame( pParent, nState );
 }
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 498af3b..3f0cbb8 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -29,7 +29,7 @@ class KDESalInstance : public X11SalInstance
     public:
         explicit 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; }
 


More information about the Libreoffice-commits mailing list