Fix FTBFS when TDE integration is enabled
Change-Id: Ia44e15044879fbbc169f7097a6f5f14346a0cf39 Reviewed-on: https://gerrit.libreoffice.org/7626 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
parent
09ce5fe4ac
commit
3ab5dc7dad
@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,tdeabdrv1))
|
|||||||
$(eval $(call gb_Library_set_include,tdeabdrv1,\
|
$(eval $(call gb_Library_set_include,tdeabdrv1,\
|
||||||
-I$(SRCDIR)/connectivity/source/inc \
|
-I$(SRCDIR)/connectivity/source/inc \
|
||||||
$$(INCLUDE) \
|
$$(INCLUDE) \
|
||||||
|
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_Library_use_sdk_api,tdeabdrv1))
|
$(eval $(call gb_Library_use_sdk_api,tdeabdrv1))
|
||||||
|
@ -77,7 +77,7 @@
|
|||||||
#include <tdeabc/field.h>
|
#include <tdeabc/field.h>
|
||||||
#include <tdeabc/stdaddressbook.h>
|
#include <tdeabc/stdaddressbook.h>
|
||||||
|
|
||||||
#include <tde_defines.h>
|
#include <shell/tde_defines.h>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
114
vcl/inc/unx/tde/tdedata.hxx
Normal file
114
vcl/inc/unx/tde/tdedata.hxx
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||||
|
/*************************************************************************
|
||||||
|
*
|
||||||
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
*
|
||||||
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
||||||
|
* Copyright 2012 Timothy Pearson
|
||||||
|
*
|
||||||
|
* OpenOffice.org - a multi-platform office productivity suite
|
||||||
|
*
|
||||||
|
* This file is part of OpenOffice.org.
|
||||||
|
*
|
||||||
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License version 3
|
||||||
|
* only, as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License version 3 for more details
|
||||||
|
* (a copy is included in the LICENSE file that accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* version 3 along with OpenOffice.org. If not, see
|
||||||
|
* <http://www.openoffice.org/license.html>
|
||||||
|
* for a copy of the LGPLv3 License.
|
||||||
|
*
|
||||||
|
************************************************************************/
|
||||||
|
|
||||||
|
#ifndef _VCL_TDEDATA_HXX
|
||||||
|
#define _VCL_TDEDATA_HXX
|
||||||
|
|
||||||
|
#include <unx/saldisp.hxx>
|
||||||
|
#include <unx/saldata.hxx>
|
||||||
|
#include <unx/salframe.h>
|
||||||
|
|
||||||
|
class TDEData : public X11SalData
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TDEData( SalInstance *pInstance ) : X11SalData( SAL_DATA_TDE, pInstance ) {}
|
||||||
|
virtual ~TDEData();
|
||||||
|
|
||||||
|
virtual void Init();
|
||||||
|
virtual void initNWF();
|
||||||
|
virtual void deInitNWF();
|
||||||
|
};
|
||||||
|
|
||||||
|
class SalTDEDisplay : public SalX11Display
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
SalTDEDisplay( Display* pDisp );
|
||||||
|
virtual ~SalTDEDisplay();
|
||||||
|
};
|
||||||
|
|
||||||
|
class TDESalFrame : public X11SalFrame
|
||||||
|
{
|
||||||
|
static const int nMaxGraphics = 2;
|
||||||
|
|
||||||
|
struct GraphicsHolder
|
||||||
|
{
|
||||||
|
X11SalGraphics* pGraphics;
|
||||||
|
bool bInUse;
|
||||||
|
GraphicsHolder()
|
||||||
|
: pGraphics( NULL ),
|
||||||
|
bInUse( false )
|
||||||
|
{}
|
||||||
|
~GraphicsHolder();
|
||||||
|
};
|
||||||
|
GraphicsHolder m_aGraphics[ nMaxGraphics ];
|
||||||
|
|
||||||
|
public:
|
||||||
|
TDESalFrame( SalFrame* pParent, sal_uLong );
|
||||||
|
virtual ~TDESalFrame();
|
||||||
|
|
||||||
|
virtual SalGraphics* GetGraphics();
|
||||||
|
virtual void ReleaseGraphics( SalGraphics *pGraphics );
|
||||||
|
virtual void updateGraphics( bool bClear );
|
||||||
|
virtual void UpdateSettings( AllSettings& rSettings );
|
||||||
|
virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate );
|
||||||
|
};
|
||||||
|
|
||||||
|
class TDESalInstance : public X11SalInstance
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TDESalInstance( SalYieldMutex* pMutex )
|
||||||
|
: X11SalInstance( pMutex ) {}
|
||||||
|
virtual ~TDESalInstance() {}
|
||||||
|
virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
|
||||||
|
};
|
||||||
|
|
||||||
|
class TDEXLib : public SalXLib
|
||||||
|
{
|
||||||
|
bool m_bStartupDone;
|
||||||
|
void* m_pApplication;
|
||||||
|
char** m_pFreeCmdLineArgs;
|
||||||
|
char** m_pAppCmdLineArgs;
|
||||||
|
int m_nFakeCmdLineArgs;
|
||||||
|
public:
|
||||||
|
TDEXLib() : SalXLib(),
|
||||||
|
m_bStartupDone( false ),
|
||||||
|
m_pApplication( NULL ),
|
||||||
|
m_pFreeCmdLineArgs( NULL ),
|
||||||
|
m_pAppCmdLineArgs( NULL ),
|
||||||
|
m_nFakeCmdLineArgs( 0 )
|
||||||
|
{}
|
||||||
|
virtual ~TDEXLib();
|
||||||
|
virtual void Init();
|
||||||
|
|
||||||
|
void doStartup();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // _VCL_TDEDATA_HXX
|
||||||
|
|
||||||
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
Loading…
x
Reference in New Issue
Block a user