connectivity/Library_tdeabdrv1.mk | 1
include/shell/tde_headers.h | 2
vcl/inc/unx/tde/tdedata.hxx | 114 ++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 1 deletion(-)
New commits:
commit 3ab5dc7dad0bc0fdeaffaa40e38c5fbaf49698ce
Author: Timothy Pearson <kb9...@pearsoncomputing.net>
Date: Fri Jan 24 03:45:12 2014 +0000
Fix FTBFS when TDE integration is enabled
Change-Id: Ia44e15044879fbbc169f7097a6f5f14346a0cf39
Reviewed-on: https://gerrit.libreoffice.org/7626
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/connectivity/Library_tdeabdrv1.mk
b/connectivity/Library_tdeabdrv1.mk
index bdfe273..8301e5f 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,tdeabdrv1))
$(eval $(call gb_Library_set_include,tdeabdrv1,\
-I$(SRCDIR)/connectivity/source/inc \
$$(INCLUDE) \
+ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
$(eval $(call gb_Library_use_sdk_api,tdeabdrv1))
diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h
index c4f2ac3..c537ea3 100644
--- a/include/shell/tde_headers.h
+++ b/include/shell/tde_headers.h
@@ -77,7 +77,7 @@
#include <tdeabc/field.h>
#include <tdeabc/stdaddressbook.h>
-#include <tde_defines.h>
+#include <shell/tde_defines.h>
#endif
diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx
new file mode 100644
index 0000000..c6b8dac
--- /dev/null
+++ b/vcl/inc/unx/tde/tdedata.hxx
@@ -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: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
