diff options
| -rw-r--r-- | Repository.mk | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | connectivity/Configuration_tdeab.mk | 4 | ||||
| -rw-r--r-- | connectivity/Library_tdeab1.mk | 5 | ||||
| -rw-r--r-- | connectivity/Library_tdeabdrv1.mk | 9 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 2 | ||||
| -rw-r--r-- | connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu | 37 | ||||
| -rw-r--r-- | connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu | 46 | ||||
| -rw-r--r-- | fpicker/source/generic/fpicker.cxx | 8 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_tde.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 21 | ||||
| -rw-r--r-- | scp2/source/tde/file_tde.scp | 2 |
13 files changed, 83 insertions, 59 deletions
diff --git a/Repository.mk b/Repository.mk index 2cb1b02bd0a9..3cefd4fd94d1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -357,6 +357,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ swd \ swui \ t602filter \ + tdeab1 \ + tdeabdrv1 \ textconversiondlgs \ textfd \ tk \ @@ -568,6 +570,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 02b98cf3628d..c47a5fed6713 100644 --- a/configure.in +++ b/configure.in @@ -9912,7 +9912,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 eb6c10242bb3..9cc62e2433f1 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_sdk_api,tdeab1)) $(eval $(call gb_Library_use_libraries,tdeab1,\ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index fbbd57d6c149..b2ceb087b798 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -27,8 +27,17 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) +$(eval $(call gb_Library_set_include,tdeabdrv1,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_sdk_api,tdeabdrv1)) +$(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/openofffice/Office/DataAccess/Drivers.xcu deleted file mode 100644 index 1a5080fed6af..000000000000 --- a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . - --> -<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <node oor:name="Installed" install:module="tdeab"> - <node oor:name="sdbc:address:tdeab" oor:op="replace"> - <prop oor:name="Driver"> - <value>com.sun.star.comp.sdbc.tdeab.Driver</value> - </prop> - <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> - <value xml:lang="en-US">TDE Address Book</value> - </prop> - <node oor:name="Features"> - <node oor:name="EscapeDateTime" oor:op="replace"> - <prop oor:name="Value" oor:type="xs:boolean"> - <value>true</value> - </prop> - </node> - </node> - </node> - </node> -</oor:component-data> diff --git a/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu new file mode 100644 index 000000000000..6e7907aa2197 --- /dev/null +++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************************** + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * 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. + * + ************************************************************************ --> +<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <node oor:name="Installed" install:module="tdeab"> + <node oor:name="sdbc:address:tdeab" oor:op="replace"> + <prop oor:name="Driver"> + <value>com.sun.star.comp.sdbc.tdeab.Driver</value> + </prop> + <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> + <value xml:lang="en-US">TDE Address Book</value> + </prop> + <node oor:name="Features"> + <node oor:name="EscapeDateTime" oor:op="replace"> + <prop oor:name="Value" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + </node> + </node> + </node> +</oor:component-data> diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index a9590e409ad3..1222025a3786 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -48,7 +48,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")); @@ -129,7 +131,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 ac1429941f1f..7fe17a003836 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -47,6 +47,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_NSPLUGIN \ ENABLE_ONLINE_UPDATE \ ENABLE_OPENGL \ + ENABLE_TDE \ + ENABLE_TDEAB \ ENABLE_TELEPATHY \ 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 de2c541ab4ec..0fe6495d2467 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -428,27 +428,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)); |