Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
0700d6a1
Kaydet (Commit)
0700d6a1
authored
Agu 18, 2012
tarafından
Timothy Pearson
Kaydeden (comit)
David Tardon
Agu 18, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix TDE FTBFS
Change-Id: Icde6310d922a3d5e2822789a23403b9f188efaf4
üst
cd3b24f2
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
63 additions
and
39 deletions
+63
-39
Repository.mk
Repository.mk
+3
-0
configure.in
configure.in
+1
-1
Configuration_tdeab.mk
connectivity/Configuration_tdeab.mk
+3
-1
Library_tdeab1.mk
connectivity/Library_tdeab1.mk
+5
-0
Library_tdeabdrv1.mk
connectivity/Library_tdeabdrv1.mk
+9
-0
Module_connectivity.mk
connectivity/Module_connectivity.mk
+1
-1
Drivers.xcu
...gistry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
+26
-17
fpicker.cxx
fpicker/source/generic/fpicker.cxx
+6
-2
InstallModule_ooo.mk
scp2/InstallModule_ooo.mk
+2
-0
InstallModule_tde.mk
scp2/InstallModule_tde.mk
+1
-0
file_library_ooo.scp
scp2/source/ooo/file_library_ooo.scp
+5
-16
file_tde.scp
scp2/source/tde/file_tde.scp
+1
-1
No files found.
Repository.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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 \
...
...
configure.in
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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 -l
kio -l
tdeui -ltdecore -ltqt -ltqt-mt"
fi
AC_SUBST(TDE_CFLAGS)
AC_SUBST(TDE_LIBS)
...
...
connectivity/Configuration_tdeab.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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-t
de
ab.xcu \
))
$(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\
...
...
connectivity/Library_tdeab1.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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,\
...
...
connectivity/Library_tdeabdrv1.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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 \
))
...
...
connectivity/Module_connectivity.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -74,7 +74,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
ifeq ($(ENABLE_TAB),TRUE)
ifeq ($(ENABLE_T
DE
AB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_tdeab \
Library_tdeab1 \
...
...
connectivity/registry/tdeab/org/openoff
f
ice/Office/DataAccess/Drivers.xcu
→
connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
Dosyayı görüntüle @
0700d6a1
<?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 .
-->
<!--***********************************************************************
*
* 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"
>
...
...
fpicker/source/generic/fpicker.cxx
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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"
));
...
...
scp2/InstallModule_ooo.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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 \
...
...
scp2/InstallModule_tde.mk
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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,\
...
...
scp2/source/ooo/file_library_ooo.scp
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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;
...
...
scp2/source/tde/file_tde.scp
Dosyayı görüntüle @
0700d6a1
...
...
@@ -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));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment