TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Clean up TDE integration patch for LO

Browse Source
r14.0.x
Timothy Pearson 12 years ago
parent 7d93f4fd7c
commit ff8c3e1566
1 changed files with 214 additions and 461 deletions
Show Stats Download Patch File Download Diff File

675
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -355,205 +355,6 @@ index e3943eb..093bfca 100644
dnl Test whether to include KDE AB support
dnl ===================================================================
AC_MSG_CHECKING([whether to enable KDE address book support])
diff --git a/connectivity/inc/tde_defines.h b/connectivity/inc/tde_defines.h
new file mode 100644
index 0000000..52e610c
--- /dev/null
+++ b/connectivity/inc/tde_defines.h
@@ -0,0 +1,93 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H
+#define INCLUDED_VCL_TDE_DEFINE_HEADERS_H
+
+#define QObject TQObject
+#define QWidget TQWidget
+#define QVBox TQVBox
+#define QHBox TQHBox
+#define QGrid TQGrid
+#define QString TQString
+#define QStringList TQStringList
+#define QCustomEvent TQCustomEvent
+#define QMutex TQMutex
+#define QEvent TQEvent
+#define QFont TQFont
+#define QDateTime TQDateTime
+#define QThread TQThread
+#define QStyle TQStyle
+#define QApplication TQApplication
+#define QRect TQRect
+#define QProgressBar TQProgressBar
+#define QPopupMenu TQPopupMenu
+#define QMenuBar TQMenuBar
+#define QToolButton TQToolButton
+#define QToolBar TQToolBar
+#define QScrollBar TQScrollBar
+#define QListView TQListView
+#define QSpinWidget TQSpinWidget
+#define QScrollBar TQScrollBar
+#define QLineEdit TQLineEdit
+#define QComboBox TQComboBox
+#define QCheckBox TQCheckBox
+#define QRadioButton TQRadioButton
+#define QPushButton TQPushButton
+#define QPainter TQPainter
+#define QResizeEvent TQResizeEvent
+#define QShowEvent TQShowEvent
+#define QPoint TQPoint
+#define QDialog TQDialog
+#define QFile TQFile
+#define QLabel TQLabel
+#define QObjectList TQObjectList
+#define QCString TQCString
+#define QRegExp TQRegExp
+#define QSessionManager TQSessionManager
+#define QPaintDevice TQPaintDevice
+#define QTextIStream TQTextIStream
+#define QTextStream TQTextStream
+#define QMutexLocker TQMutexLocker
+#define QValueList TQValueList
+#define QTab TQTab
+#define QTabBar TQTabBar
+#define QTabWidget TQTabWidget
+#define QMainWindow TQMainWindow
+#define QPixmap TQPixmap
+#define QColorGroup TQColorGroup
+#define QStyleOption TQStyleOption
+#define QSize TQSize
+#define QMenuItem TQMenuItem
+#define QFontInfo TQFontInfo
+
+#define qSwap tqSwap
+#define qt_cast tqt_cast
+#define qt_xdisplay tqt_xdisplay
+#define qVersion tqVersion
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/tde_headers.h b/connectivity/inc/tde_headers.h
new file mode 100644
index 0000000..e9ff855
--- /dev/null
+++ b/connectivity/inc/tde_headers.h
@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_VCL_TDE_HEADERS_H
+#define INCLUDED_VCL_TDE_HEADERS_H
+
+/* ********* Suppress warnings if needed */
+#include "sal/config.h"
+
+#if defined __GNUC__
+#pragma GCC system_header
+#endif
+
+
+/* ********* Hack, but needed because of conflicting types... */
+#define Region TQtXRegion
+
+
+/* ********* TQt headers */
+#include <tqaccessible.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqfont.h>
+#include <tqframe.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqmainwindow.h>
+#include <tqmenudata.h>
+#include <tqpaintdevice.h>
+#include <tqpainter.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqrangecontrol.h>
+#include <tqstring.h>
+#include <tqtabbar.h>
+#include <tqtabwidget.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqwidget.h>
+#include <tqprogressbar.h>
+
+/* ********* See hack on top of this file */
+#undef Region
+
+
+/* ********* TDE base headers */
+#include <kaboutdata.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <kconfig.h>
+#include <tdeversion.h>
+#include <kemailsettings.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
+#include <kstyle.h>
+
+
+/* ********* TDE address book connectivity headers */
+#include <kabc/addressbook.h>
+#include <kabc/addressee.h>
+#include <kabc/field.h>
+#include <kabc/stdaddressbook.h>
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index b80de85..1801ad8 100644
--- a/connectivity/prj/d.lst
@ -575,44 +376,30 @@ index b80de85..1801ad8 100644
..\%__SRC%\misc\macab1.component %_DEST%\xml\macab1.component
..\%__SRC%\misc\mozab.component %_DEST%\xml\mozab.component
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 70b51c8..6fd4f42 100644
index 70b51c8..d172aa6 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -35,7 +35,16 @@
@@ -35,7 +35,8 @@
#include "KCatalog.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <shell/kde_headers.h>
+
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
+#include <kde_headers.h>
using namespace connectivity::kab;
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 13a3216..f746581 100644
index 13a3216..08abbff 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -29,7 +29,16 @@
@@ -29,7 +29,8 @@
#include "KDEInit.h"
#include <osl/diagnose.h>
#include <osl/process.h>
-#include <shell/kde_headers.h>
+
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
+#include <kde_headers.h>
namespace connectivity
{
@ -648,115 +435,80 @@ index 9a5ea70..b70df86 100644
#endif // CONNECTIVITY_KAB_KDEINIT_H
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 8077ce6..02ef44c9 100644
index 8077ce6..125d638 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -30,7 +30,17 @@
@@ -30,7 +30,9 @@
#include "KDatabaseMetaData.hxx"
#include "kfields.hxx"
#include "KDEInit.h"
-#include <shell/kde_headers.h>
+
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
+#include <kde_headers.h>
+
#include "FDatabaseMetaDataResultSet.hxx"
#include "OTypeInfo.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index fc7e5f4..406edc4 100644
index fc7e5f4..07b385f 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -31,7 +31,17 @@
@@ -31,7 +31,9 @@
#include "KStatement.hxx"
#include "KResultSetMetaData.hxx"
-#include <shell/kde_headers.h>
+
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
+#include <kde_headers.h>
+
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index 34e014c..9a83488 100644
index 34e014c..475c22d 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -30,7 +30,17 @@
@@ -30,7 +30,9 @@
#define _CONNECTIVITY_KAB_CONDITION_HXX_
#include <comphelper/types.hxx>
-#include <shell/kde_headers.h>
+
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
+#include <kde_headers.h>
+
#include <connectivity/dbexception.hxx>
namespace connectivity
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index 6a79455..9cee583 100644
index 6a79455..10faa70 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -29,7 +29,16 @@
@@ -29,7 +29,8 @@
#ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
#define _CONNECTIVITY_KAB_FIELDS_HXX_
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
-#include <shell/kde_headers.h>
+#include <kde_headers.h>
+
#include <connectivity/dbexception.hxx>
#include <rtl/ustring.hxx>
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index 29fa963..cf4ad67 100644
index 29fa963..612fff4 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -30,7 +30,16 @@
@@ -30,7 +30,8 @@
#define _CONNECTIVITY_KAB_ORDER_HXX_
#include "rtl/ustring.hxx"
-#include <shell/kde_headers.h>
+
+#ifdef ENABLE_TDE
+#include "tde_defines.h"
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include "tde_headers.h"
+#else // ENABLE_TDE
#include <shell/kde_headers.h>
+#endif // ENABLE_TDE
+#include <kde_headers.h>
#include <vector>
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 9494037..b2856aa 100644
index 9494037..bce8aa2 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -28,8 +28,6 @@
@ -784,107 +536,107 @@ index 9494037..b2856aa 100644
-dummy:
-# nothing
+ .IF "$(ENABLE_TDEAB)" == "TRUE"
+
+ TARGET=tdeab
+ TARGET2=$(TARGET)drv
+
+ CFLAGS+=$(TDE_CFLAGS)
+ CFLAGS+=-DENABLE_TDE
+ CFLAGSCXX+=-DENABLE_TDE
+
+ .IF "$(TDE_ROOT)"!=""
+ EXTRALIBPATHS+=-L$(TDE_ROOT)$/lib
+ .IF "$(OS)$(CPU)" == "LINUXX"
+ EXTRALIBPATHS+=-L$(TDE_ROOT)$/lib64
+ .ENDIF
+ .ENDIF
+
+ # === TDEAB base library ==========================
+
+ # --- Files -------------------------------------
+
+ SLOFILES= \
+ $(SLO)$/KDriver.obj \
+ $(SLO)$/KServices.obj
+
+ DEPOBJFILES= \
+ $(SLO2FILES)
+
+ # --- Library -----------------------------------
+
+ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+
+ SHL1TARGET= $(TARGET)$(TDEAB_MAJOR)
+ SHL1OBJS=$(SLOFILES)
+ SHL1STDLIBS=\
+ $(COMPHELPERLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(DBTOOLSLIB) \
+ $(SALLIB) \
+ $(SALHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
+
+ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
+ DEF1NAME= $(SHL1TARGET)
+
+ # === TDEAB impl library ==========================
+
+ # --- Files -------------------------------------
+
+ SLO2FILES=\
+ $(SLO)$/KColumns.obj \
+ $(SLO)$/KTable.obj \
+ $(SLO)$/KTables.obj \
+ $(SLO)$/KCatalog.obj \
+ $(SLO)$/KResultSet.obj \
+ $(SLO)$/KStatement.obj \
+ $(SLO)$/KPreparedStatement.obj \
+ $(SLO)$/KDatabaseMetaData.obj \
+ $(SLO)$/KConnection.obj \
+ $(SLO)$/KResultSetMetaData.obj \
+ $(SLO)$/kcondition.obj \
+ $(SLO)$/korder.obj \
+ $(SLO)$/kfields.obj \
+ $(SLO)$/KDEInit.obj
+
+ TDEAB_LIB=$(TDE_LIBS) -lkabc
+
+ # --- Library -----------------------------------
+
+ SHL2VERSIONMAP=$(TARGET2).map
+
+ SHL2TARGET= $(TARGET2)$(TDEAB_MAJOR)
+ SHL2OBJS=$(SLO2FILES)
+ SHL2STDLIBS=\
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(SALLIB) \
+ $(SALHELPERLIB) \
+ $(DBTOOLSLIB) \
+ $(COMPHELPERLIB) \
+ $(TDEAB_LIB)
+
+ SHL2DEPN=
+ SHL2IMPLIB= i$(TARGET2)
+
+ SHL2DEF= $(MISC)$/$(SHL2TARGET).def
+
+ DEF2NAME= $(SHL2TARGET)
+
+ # --- Targets -----------------------------------
+ .ELSE # "$(ENABLE_TDEAB)" == "TRUE"
+ TARGET=kab
+ TARGET2=$(TARGET)drv
+
+ dummy:
+ # nothing
+
+ .ENDIF
+.IF "$(ENABLE_TDEAB)" == "TRUE"
+
+TARGET=tdeab
+TARGET2=$(TARGET)drv
+
+CFLAGS+=$(TDE_CFLAGS)
+CFLAGS+=-DENABLE_TDE -I$(SRCDIR)/shell/inc
+CFLAGSCXX+=-DENABLE_TDE -I$(SRCDIR)/shell/inc
+
+.IF "$(TDE_ROOT)"!=""
+ EXTRALIBPATHS+=-L$(TDE_ROOT)$/lib
+ .IF "$(OS)$(CPU)" == "LINUXX"
+ EXTRALIBPATHS+=-L$(TDE_ROOT)$/lib64
+ .ENDIF
+.ENDIF
+
+# === TDEAB base library ==========================
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+$(SLO)$/KDriver.obj \
+$(SLO)$/KServices.obj
+
+DEPOBJFILES= \
+$(SLO2FILES)
+
+# --- Library -----------------------------------
+
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+
+SHL1TARGET= $(TARGET)$(TDEAB_MAJOR)
+SHL1OBJS=$(SLOFILES)
+SHL1STDLIBS=\
+$(COMPHELPERLIB) \
+$(CPPULIB) \
+$(CPPUHELPERLIB) \
+$(DBTOOLSLIB) \
+$(SALLIB) \
+$(SALHELPERLIB)
+
+SHL1DEPN=
+SHL1IMPLIB= i$(TARGET)
+
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME= $(SHL1TARGET)
+
+# === TDEAB impl library ==========================
+
+# --- Files -------------------------------------
+
+SLO2FILES=\
+$(SLO)$/KColumns.obj \
+$(SLO)$/KTable.obj \
+$(SLO)$/KTables.obj \
+$(SLO)$/KCatalog.obj \
+$(SLO)$/KResultSet.obj \
+$(SLO)$/KStatement.obj \
+$(SLO)$/KPreparedStatement.obj \
+$(SLO)$/KDatabaseMetaData.obj \
+$(SLO)$/KConnection.obj \
+$(SLO)$/KResultSetMetaData.obj \
+$(SLO)$/kcondition.obj \
+$(SLO)$/korder.obj \
+$(SLO)$/kfields.obj \
+$(SLO)$/KDEInit.obj
+
+TDEAB_LIB=$(TDE_LIBS) -lkabc
+
+# --- Library -----------------------------------
+
+SHL2VERSIONMAP=$(TARGET2).map
+
+SHL2TARGET= $(TARGET2)$(TDEAB_MAJOR)
+SHL2OBJS=$(SLO2FILES)
+SHL2STDLIBS=\
+$(CPPULIB) \
+$(CPPUHELPERLIB) \
+$(SALLIB) \
+$(SALHELPERLIB) \
+$(DBTOOLSLIB) \
+$(COMPHELPERLIB) \
+$(TDEAB_LIB)
+
+SHL2DEPN=
+SHL2IMPLIB= i$(TARGET2)
+
+SHL2DEF= $(MISC)$/$(SHL2TARGET).def
+
+DEF2NAME= $(SHL2TARGET)
+
+# --- Targets -----------------------------------
+.ELSE # "$(ENABLE_TDEAB)" == "TRUE"
+ TARGET=kab
+ TARGET2=$(TARGET)drv
+
+ dummy:
+ # nothing
+
+.ENDIF
.ENDIF
@ -1595,6 +1347,32 @@ index 97127ef..0e4a704 100644
module = "gid_Module_Optional_Kde"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01"
diff --git a/shell/inc/kde_headers.h b/shell/inc/kde_headers.h
index 7ec45fd..eb33f8e 100644
--- a/shell/inc/kde_headers.h
+++ b/shell/inc/kde_headers.h
@@ -29,6 +29,12 @@
#ifndef INCLUDED_VCL_KDE_HEADERS_H
#define INCLUDED_VCL_KDE_HEADERS_H
+#ifdef ENABLE_TDE
+
+#include <tde_headers.h>
+
+#else // ENABLE_TDE
+
/* ********* Suppress warnings if needed */
#include "sal/config.h"
@@ -93,6 +99,8 @@
#include <kabc/field.h>
#include <kabc/stdaddressbook.h>
+#endif // ENABLE_TDE
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/tde_defines.h b/shell/inc/tde_defines.h
new file mode 100644
index 0000000..52e610c
@ -1696,10 +1474,10 @@ index 0000000..52e610c
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/tde_headers.h b/shell/inc/tde_headers.h
new file mode 100644
index 0000000..e9ff855
index 0000000..d0f1444
--- /dev/null
+++ b/shell/inc/tde_headers.h
@@ -0,0 +1,94 @@
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
@ -1731,6 +1509,8 @@ index 0000000..e9ff855
+/* ********* Suppress warnings if needed */
+#include "sal/config.h"
+
+#include <cstddef>
+
+#if defined __GNUC__
+#pragma GCC system_header
+#endif
@ -1790,6 +1570,7 @@ index 0000000..e9ff855
+#include <kabc/field.h>
+#include <kabc/stdaddressbook.h>
+
+#include "tde_defines.h"
+
+#endif
+
@ -2077,10 +1858,10 @@ index 0000000..d0c26e2
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk
new file mode 100644
index 0000000..8003f27
index 0000000..a92bb5e
--- /dev/null
+++ b/vcl/Executable_tdefilepicker.mk
@@ -0,0 +1,70 @@
@@ -0,0 +1,71 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@ -2120,6 +1901,7 @@ index 0000000..8003f27
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(SRCDIR)/vcl/inc/unx/tde \
+))
+
+$(eval $(call gb_Executable_use_libraries,tdefilepicker,\
@ -2153,10 +1935,10 @@ index 0000000..8003f27
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
new file mode 100644
index 0000000..a937dd3
index 0000000..2e3a8c6
--- /dev/null
+++ b/vcl/Library_vclplug_tde.mk
@@ -0,0 +1,106 @@
@@ -0,0 +1,107 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
@ -2193,6 +1975,7 @@ index 0000000..a937dd3
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(SRCDIR)/vcl/inc/unx/tde \
+))
+
+$(eval $(call gb_Library_set_include,vclplug_tde,\
@ -2306,6 +2089,32 @@ index de4ebb8..4ec9d7b 100644
DESKTOP_KDE,
DESKTOP_KDE4,
DESKTOP_CDE
diff --git a/vcl/inc/unx/kde/kde_headers.h b/vcl/inc/unx/kde/kde_headers.h
index 7ec45fd..eb33f8e 100644
--- a/vcl/inc/unx/kde/kde_headers.h
+++ b/vcl/inc/unx/kde/kde_headers.h
@@ -29,6 +29,12 @@
#ifndef INCLUDED_VCL_KDE_HEADERS_H
#define INCLUDED_VCL_KDE_HEADERS_H
+#ifdef ENABLE_TDE
+
+#include <tde_headers.h>
+
+#else // ENABLE_TDE
+
/* ********* Suppress warnings if needed */
#include "sal/config.h"
@@ -93,6 +99,8 @@
#include <kabc/field.h>
#include <kabc/stdaddressbook.h>
+#endif // ENABLE_TDE
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/tde/tde_defines.h b/vcl/inc/unx/tde/tde_defines.h
new file mode 100644
index 0000000..52e610c
@ -2407,10 +2216,10 @@ index 0000000..52e610c
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/tde/tde_headers.h b/vcl/inc/unx/tde/tde_headers.h
new file mode 100644
index 0000000..b2b1042
index 0000000..d0f1444
--- /dev/null
+++ b/vcl/inc/unx/tde/tde_headers.h
@@ -0,0 +1,95 @@
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
@ -2503,6 +2312,8 @@ index 0000000..b2b1042
+#include <kabc/field.h>
+#include <kabc/stdaddressbook.h>
+
+#include "tde_defines.h"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
@ -2845,18 +2656,10 @@ index 9e4cbf1..17d2dd6 100644
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index b68ddb0..e63b2d7 100644
index b68ddb0..6aeea9b 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -26,11 +26,19 @@
*
************************************************************************/
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#endif // ENABLE_TDE
+
#include <cstddef>
@@ -30,7 +30,11 @@
#include <kdecommandthread.hxx>
@ -2869,7 +2672,7 @@ index b68ddb0..e63b2d7 100644
#include <kapplication.h>
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
index 7486bf9..294b04d 100644
index 7486bf9..929a1eb 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.hxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx
@@ -29,9 +29,19 @@
@ -2877,7 +2680,7 @@ index 7486bf9..294b04d 100644
#define _KDECOMMANDTHREAD_HXX_
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#include <tde_defines.h>
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
@ -2893,17 +2696,10 @@ index 7486bf9..294b04d 100644
class KDECommandEvent : public QCustomEvent
{
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index 779a34d..180aca0 100644
index 779a34d..d52a6a7 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -28,9 +28,41 @@
#include <cstddef>
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#endif // ENABLE_TDE
+
@@ -31,6 +31,34 @@
#include <kdecommandthread.hxx>
#include <kdefilepicker.hxx>
@ -2938,7 +2734,7 @@ index 779a34d..180aca0 100644
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qgrid.h>
@@ -55,6 +87,8 @@
@@ -55,6 +83,8 @@
#include <kmessagebox.h>
#include <ktempfile.h>
@ -2975,21 +2771,10 @@ index 4d545eb..b0482d8 100644
protected:
typedef QPair< QString, QString > FilterEntry;
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index be40226..b06968a 100644
index be40226..558c01b 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -26,6 +26,10 @@
*
************************************************************************/
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#endif // ENABLE_TDE
+
#include <cstddef>
#include <kdemodalityfilter.hxx>
@@ -39,6 +43,14 @@
@@ -39,6 +39,14 @@
#include <iostream>
#include <stdlib.h>
@ -3004,7 +2789,7 @@ index be40226..b06968a 100644
//////////////////////////////////////////////////////////////////////////
// Main
//////////////////////////////////////////////////////////////////////////
@@ -54,13 +66,13 @@ int main( int argc, char* argv[] )
@@ -54,13 +62,13 @@ int main( int argc, char* argv[] )
// we fake the name of the application to have "LibreOffice" in the
// title
KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "LibreOffice" ),
@ -3020,7 +2805,7 @@ index be40226..b06968a 100644
<< "Type 'exit' and press Enter to finish." << ::std::endl;
KCmdLineArgs::addCmdLineOptions( sOptions );
@@ -77,7 +89,7 @@ int main( int argc, char* argv[] )
@@ -77,7 +85,7 @@ int main( int argc, char* argv[] )
KDEModalityFilter qModalityFilter( nWinId );
@ -3029,21 +2814,6 @@ index be40226..b06968a 100644
KDECommandThread qCommandThread( &aFileDialog );
qCommandThread.start();
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 5aeddb0..2b4ebf3 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -26,6 +26,10 @@
*
************************************************************************/
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#endif // ENABLE_TDE
+
#include <cstddef>
#include <kdemodalityfilter.hxx>
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
index 8635694..9f68e72 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
@ -3065,27 +2835,18 @@ index 8635694..9f68e72 100644
class KDEModalityFilter : public QObject
{
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index d66e227..f2a494b 100644
index d66e227..f84136a 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -28,7 +28,16 @@
@@ -28,6 +28,7 @@
#define _SV_SALDATA_CXX
+
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_headers.h>
+#else // ENABLE_TDE
#include <unx/kde/kde_headers.h>
+#endif // ENABLE_TDE
#include <unistd.h>
#include <fcntl.h>
@@ -56,6 +65,14 @@
@@ -56,6 +57,14 @@
#include "vclpluginapi.h"
@ -3100,7 +2861,7 @@ index d66e227..f2a494b 100644
/* #i59042# override KApplications method for session management
* since it will interfere badly with our own.
*/
@@ -123,7 +140,7 @@ void KDEXLib::Init()
@@ -123,7 +132,7 @@ void KDEXLib::Init()
KAboutData *kAboutData = new KAboutData( "LibreOffice",
I18N_NOOP( "LibreOffice" ),
"1.1.0",
@ -3110,23 +2871,15 @@ index d66e227..f2a494b 100644
"(c) 2003, 2004 Novell, Inc",
I18N_NOOP( "LibreOffice is an office suite.\n" ),
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 0376e94a..cd9700e 100644
index 0376e94a..e1f2dde 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -28,7 +28,17 @@
@@ -28,7 +28,9 @@
#define _SV_SALNATIVEWIDGETS_KDE_CXX
+
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_defines.h>
+#endif // ENABLE_TDE
+
+#ifdef ENABLE_TDE
+#include <unx/tde/tde_headers.h>
+#else // ENABLE_TDE
#include <unx/kde/kde_headers.h>
+#endif // ENABLE_TDE
+
#include "UnxFilePicker.hxx"

Write Preview
Loading…
Cancel
Save