[Libreoffice-commits] core.git: vcl/inc
Slávek Banko
slavek.banko at axis.cz
Sat Oct 10 11:36:41 PDT 2015
vcl/inc/unx/tde/tdedata.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4f0a68ebc4476ee0a78e638d1a08007edf8d2e3a
Author: Slávek Banko <slavek.banko at axis.cz>
Date: Sat Oct 10 13:36:09 2015 +0200
Fix FTBFS with TDE integration due to recent SalFrame changes
Change-Id: I00297726c1fc5ee8fd88f12f96befe2b2a4cf954
Reviewed-on: https://gerrit.libreoffice.org/19295
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx
index 2df9bf3..d8f1363 100644
--- a/vcl/inc/unx/tde/tdedata.hxx
+++ b/vcl/inc/unx/tde/tdedata.hxx
@@ -69,7 +69,7 @@ class TDESalFrame : public X11SalFrame
GraphicsHolder m_aGraphics[ nMaxGraphics ];
public:
- TDESalFrame( SalFrame* pParent, sal_uLong );
+ TDESalFrame( SalFrame* pParent, SalFrameStyleFlags );
virtual ~TDESalFrame();
virtual SalGraphics* AcquireGraphics();
@@ -85,7 +85,7 @@ public:
TDESalInstance( SalYieldMutex* pMutex )
: X11SalInstance( pMutex ) {}
virtual ~TDESalInstance() {}
- virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
+ virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
};
class TDEXLib : public SalXLib
More information about the Libreoffice-commits
mailing list