Kaydet (Commit) 5c9e9998 authored tarafından Noel Grandin's avatar Noel Grandin

fix KDE3 build

after my commit 0e30af6f
"convert SAL_FRAME_STYLE to scoped enum"

Change-Id: Iefa1b9a39a50ea09fb6a2615196a8adcea40df0d
üst c1df3a34
...@@ -59,7 +59,7 @@ class KDESalFrame : public X11SalFrame ...@@ -59,7 +59,7 @@ class KDESalFrame : public X11SalFrame
GraphicsHolder m_aGraphics[ nMaxGraphics ]; GraphicsHolder m_aGraphics[ nMaxGraphics ];
public: public:
KDESalFrame( SalFrame* pParent, sal_uLong ); KDESalFrame( SalFrame* pParent, SalFrameStyleFlags );
virtual ~KDESalFrame(); virtual ~KDESalFrame();
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
KDESalInstance( SalYieldMutex* pMutex ) KDESalInstance( SalYieldMutex* pMutex )
: X11SalInstance( pMutex ) {} : X11SalInstance( pMutex ) {}
virtual ~KDESalInstance() {} 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; } virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; }
......
...@@ -1725,7 +1725,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar ...@@ -1725,7 +1725,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
// KDESalFrame implementation // KDESalFrame implementation
KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) : KDESalFrame::KDESalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) :
X11SalFrame( pParent, nStyle ) X11SalFrame( pParent, nStyle )
{ {
} }
...@@ -2096,8 +2096,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder() ...@@ -2096,8 +2096,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder()
// KDESalInstance implementation // KDESalInstance implementation
SalFrame * SalFrame * KDESalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nStyle )
KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle )
{ {
return new KDESalFrame( pParent, nStyle ); return new KDESalFrame( pParent, nStyle );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment