fix TDE FTBFS

Change-Id: Icde6310d922a3d5e2822789a23403b9f188efaf4
Signed-off-by: David Tardon <dtardon@redhat.com>

12 files changed, 37 insertions, 22 deletions

diff --git a/Repository.mk b/Repository.mk
index 2edad91db13a..6d74bfaa7ae5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -355,6 +355,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     swd \
     swui \
     t602filter \
+	tdeab1 \
+	tdeabdrv1 \
     textconversiondlgs \
     textfd \
     tk \
@@ -552,6 +554,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     slideshow \
     stringresource \
     syssh \
+    tdebe1 \
     ucpcmis1 \
     ucpexpand1 \
     ucpext \
diff --git a/configure.in b/configure.in
index 444cf82080ce..e631f6d0ca4c 100644
--- a/configure.in
+++ b/configure.in
@@ -9577,7 +9577,7 @@ your TDE installation by exporting TDEDIR before running "configure".])
 
     dnl Set the variables
     TDE_CFLAGS="-I$tqt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-    TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeui -ltdecore -ltqt -ltqt-mt"
+    TDE_LIBS="-L$tde_libdir -L$tqt_libdir -lkio -ltdeui -ltdecore -ltqt -ltqt-mt"
 fi
 AC_SUBST(TDE_CFLAGS)
 AC_SUBST(TDE_LIBS)
diff --git a/connectivity/Configuration_tdeab.mk b/connectivity/Configuration_tdeab.mk
index 190b85e72dfe..1ce14dd18199 100644
--- a/connectivity/Configuration_tdeab.mk
+++ b/connectivity/Configuration_tdeab.mk
@@ -14,6 +14,8 @@
 # Major Contributor(s):
 # Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
 #  (initial developer)
+# Copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
+#  (TDE version)
 #
 # All Rights Reserved.
 #
@@ -28,7 +30,7 @@
 $(eval $(call gb_Configuration_Configuration,driver_tdeab))
 
 $(eval $(call gb_Configuration_add_spool_modules,driver_tdeab,connectivity/registry/tdeab,\
-	org/openoffice/Office/DataAccess/Drivers-tab.xcu \
+	org/openoffice/Office/DataAccess/Drivers-tdeab.xcu \
 ))
 
 $(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 63602f490306..2192b19c07b6 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -33,6 +33,11 @@ $(eval $(call gb_Library_use_externals,tdeab1,\
 
 $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
 
+$(eval $(call gb_Library_set_include,tdeab1,\
+	-I$(SRCDIR)/connectivity/source/inc \
+	$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_api,tdeab1,\
 	offapi \
 	udkapi \
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index 1f3a8ea80f9f..165a05b35124 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -27,11 +27,20 @@
 
 $(eval $(call gb_Library_Library,tdeabdrv1))
 
+$(eval $(call gb_Library_set_include,tdeabdrv1,\
+	-I$(SRCDIR)/connectivity/source/inc \
+	$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_api,tdeabdrv1,\
 	offapi \
 	udkapi \
 ))
 
+$(eval $(call gb_Library_use_externals,tdeabdrv1,\
+	tde \
+))
+
 $(eval $(call gb_Library_add_libs,tdeabdrv1,\
 	-lkabc \
 ))
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index a57b42d0269a..b0dcdf836b14 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -74,7 +74,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-ifeq ($(ENABLE_TAB),TRUE)
+ifeq ($(ENABLE_TDEAB),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_tdeab \
 	Library_tdeab1 \
diff --git a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
index 6e7907aa2197..6e7907aa2197 100644
--- a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index a21cc88846a4..46786d77f8b2 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -57,7 +57,9 @@ static OUString FilePicker_getSystemPickerServiceName()
 {
 #ifdef UNX
     OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
-    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+        return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFilePicker"));
+    else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker"));
     else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker"));
@@ -138,7 +140,9 @@ static OUString FolderPicker_getSystemPickerServiceName()
 {
     OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
 #ifdef UNX
-    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+        return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker"));
+    else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
     else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index b903a03963c8..0c494146fb82 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -46,6 +46,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_NSPLUGIN \
 	ENABLE_ONLINE_UPDATE \
 	ENABLE_OPENGL \
+	ENABLE_TDE \
+	ENABLE_TDEAB \
 	ENABLE_XMLSEC \
 	MERGELIBS \
 	SYSTEM_BOOST \
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
index 68b1c959a2ee..e20e390bc6f6 100644
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_InstallModule_use_packages,scp2/tde,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
 	ENABLE_TDE \
+	ENABLE_TDEAB \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6e5ec3f02d64..66c50e2c7dad 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -432,27 +432,16 @@ End
 
 #ifdef UNX
 
-#ifdef ENABLE_TDEAB
-File gid_File_Lib_Tdeab_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libtdeab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Tdeab_Drv_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libtdeabdrv1,UNXSUFFIX));
-End
-#endif
-
 #ifdef ENABLE_KAB
 STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
 STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
 #endif
 
+#ifdef ENABLE_TDEAB
+STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
+STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
+#endif
+
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
     LIB_FILE_BODY;
diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp
index b4a7e1daf157..0a767d727f7e 100644
--- a/scp2/source/tde/file_tde.scp
+++ b/scp2/source/tde/file_tde.scp
@@ -25,7 +25,7 @@
 
 #ifdef ENABLE_TDE
 File gid_File_Lib_Tdebe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX));