rpms/openoffice.org/devel openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.4, 1.5 openoffice.org-2.2.0.rh232389.tango.patch, 1.3, 1.4 openoffice.org.spec, 1.1130, 1.1131
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 30 14:39:53 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16641
Modified Files:
openoffice.org-2.2.0.ooo53397.linkopt.patch
openoffice.org-2.2.0.rh232389.tango.patch openoffice.org.spec
Log Message:
remove non tango icons
openoffice.org-2.2.0.ooo53397.linkopt.patch:
UnoControls/prj/build.lst | 2
UnoControls/util/makefile.mk | 3
automation/prj/build.lst | 2
automation/util/makefile.mk | 52 --
avmedia/source/gstreamer/makefile.mk | 2
avmedia/source/xine/makefile.mk | 2
avmedia/util/makefile.mk | 2
basctl/util/makefile.mk | 13
basegfx/prj/d.lst | 2
basegfx/util/makefile.mk | 2
basic/prj/d.lst | 2
basic/source/uno/sbservices.cxx | 13
basic/util/makefile.mk | 2
bf_forms/util/makefile.mk | 0
bf_goodies/util/makefile.mk | 0
bf_linguistic/source/makefile.mk | 0
bf_offmgr/util/makefile.mk | 0
bf_sc/util/makefile.mk | 0
bf_sch/util/makefile.mk | 0
bf_sd/util/makefile.mk | 0
bf_starmath/util/makefile.mk | 0
bf_svx/util/makefile.mk | 0
bf_sw/util/makefile.mk | 0
bf_xmloff/util/makefile.mk | 0
binfilter/bf_forms/util/makefile.mk | 11
binfilter/bf_goodies/util/makefile.mk | 3
binfilter/bf_linguistic/source/makefile.mk | 9
binfilter/bf_offmgr/util/makefile.mk | 10
binfilter/bf_sc/util/makefile.mk | 14
binfilter/bf_sch/util/makefile.mk | 9
binfilter/bf_sd/util/makefile.mk | 14
binfilter/bf_starmath/util/makefile.mk | 10
binfilter/bf_svx/util/makefile.mk | 16
binfilter/bf_sw/util/makefile.mk | 13
binfilter/bf_xmloff/util/makefile.mk | 13
binfilter/binfilterdetect/source/makefile.mk | 8
binfilter/filter/source/bf_migrate/makefile.mk | 9
binfilter/filter/source/bf_offwrp/makefile.mk | 14
binfilterdetect/source/makefile.mk | 0
bmpmaker/makefile.mk | 0
bootstrp/addexes2/makefile.mk | 0
bootstrp/makefile.mk | 0
canvas/prj/build.lst | 2
canvas/source/cairo/makefile.mk | 2
canvas/source/null/makefile.mk | 2
canvas/source/tools/makefile.mk | 2
canvas/source/vcl/makefile.mk | 2
chart2/source/controller/makefile.mk | 15
chart2/source/model/makefile.mk | 4
chart2/source/tools/makefile.mk | 5
chart2/source/view/makefile.mk | 14
comphelper/prj/d.lst | 2
comphelper/source/misc/facreg.cxx | 9
comphelper/util/makefile.mk | 2
configmgr/prj/d.lst | 2
configmgr/source/backendhelper/componentdf.cxx | 13
configmgr/source/backendhelper/makefile.mk | 2
configmgr/source/misc/configunoreg.cxx | 13
configmgr/source/platformbe/componentdefn.cxx | 14
configmgr/source/platformbe/makefile.mk | 2
configmgr/util/makefile.mk | 22
connectivity/source/cpool/makefile.mk | 3
connectivity/source/dbtools/makefile.mk | 5
connectivity/source/drivers/adabas/makefile.mk | 3
connectivity/source/drivers/calc/makefile.mk | 9
connectivity/source/drivers/dbase/makefile.mk | 8
connectivity/source/drivers/evoab/makefile.mk | 11
connectivity/source/drivers/evoab2/makefile.mk | 10
connectivity/source/drivers/file/makefile.mk | 8
connectivity/source/drivers/flat/makefile.mk | 11
connectivity/source/drivers/hsqldb/makefile.mk | 3
connectivity/source/drivers/jdbc/makefile.mk | 3
connectivity/source/drivers/mysql/makefile.mk | 4
connectivity/source/drivers/odbc/makefile.mk | 3
connectivity/source/manager/makefile.mk | 1
dbaccess/source/filter/migration/makefile.mk | 7
dbaccess/source/filter/xml/makefile.mk | 13
desktop/prj/build.lst | 16
desktop/prj/d.lst | 2
desktop/source/app/appinit.cxx | 152 ++++++
desktop/source/app/makefile.mk | 44 -
desktop/source/deployment/gui/makefile.mk | 12
desktop/source/deployment/makefile.mk | 8
desktop/source/deployment/misc/makefile.mk | 5
desktop/source/migration/services/makefile.mk | 6
desktop/source/offacc/makefile.mk | 2
desktop/source/pkgchk/makefile.mk | 13
desktop/source/pkgchk/unopkg/makefile.mk | 12
desktop/source/so_comp/makefile.mk | 8
desktop/source/splash/makefile.mk | 15
desktop/source/splash/services_spl.cxx | 12
desktop/util/makefile.mk | 143 +++--
dtrans/prj/build.lst | 2
dtrans/prj/d.lst | 2
dtrans/source/X11/X11_service.cxx | 11
dtrans/source/X11/makefile.mk | 12
embeddedobj/source/msole/makefile.mk | 7
embeddedobj/util/makefile.mk | 2
extensions/source/abpilot/makefile.mk | 11
extensions/source/bibliography/makefile.mk | 9
extensions/source/dbpilots/makefile.mk | 7
extensions/source/nsplugin/source/makefile.mk | 9
extensions/source/packer/makefile.mk | 2
extensions/source/plugin/unx/makefile.mk | 3
extensions/source/plugin/util/makefile.mk | 10
extensions/source/preload/makefile.mk | 7
extensions/source/propctrlr/makefile.mk | 10
extensions/source/resource/makefile.mk | 9
extensions/source/scanner/makefile.mk | 17
extensions/source/svg/makefile.mk | 4
extensions/source/update/ui/makefile.mk | 6
extensions/source/xmlextract/makefile.mk | 4
fileaccess/prj/build.lst | 2
fileaccess/prj/d.lst | 2
fileaccess/source/FileAccess.cxx | 10
fileaccess/source/makefile.mk | 18
filter/source/bf_migrate/makefile.mk | 0
filter/source/bf_offwrp/makefile.mk | 0
filter/source/config/cache/makefile.mk | 7
filter/source/filtertracer/makefile.mk | 5
filter/source/flash/makefile.mk | 7
filter/source/msfilter/powerpoint/makefile.mk | 3
filter/source/pdf/makefile.mk | 9
filter/source/svg/makefile.mk | 7
filter/source/xmlfilteradaptor/makefile.mk | 4
filter/source/xmlfilterdetect/makefile.mk | 3
filter/source/xsltdialog/makefile.mk | 11
filter/source/xsltfilter/makefile.mk | 6
fpicker/source/generic/makefile.mk | 3
fpicker/source/office/makefile.mk | 9
fpicker/source/unx/gnome/makefile.mk | 4
framework/inc/macros/registration.hxx | 20
framework/prj/d.lst | 2
framework/source/register/register3rdcomponents.cxx | 10
framework/source/register/registerservices.cxx | 10
framework/source/register/registertemp.cxx | 10
framework/util/makefile.mk | 61 +-
goodies/prj/d.lst | 2
goodies/source/filter.vcl/egif/makefile.mk | 2
goodies/source/filter.vcl/eos2met/makefile.mk | 2
goodies/source/filter.vcl/epbm/makefile.mk | 2
goodies/source/filter.vcl/epgm/makefile.mk | 2
goodies/source/filter.vcl/epict/makefile.mk | 2
goodies/source/filter.vcl/eppm/makefile.mk | 2
goodies/source/filter.vcl/eps/makefile.mk | 2
goodies/source/filter.vcl/eras/makefile.mk | 2
goodies/source/filter.vcl/etiff/makefile.mk | 2
goodies/source/filter.vcl/expm/makefile.mk | 2
goodies/source/filter.vcl/icgm/makefile.mk | 5
goodies/source/filter.vcl/idxf/makefile.mk | 2
goodies/source/filter.vcl/ieps/makefile.mk | 2
goodies/source/filter.vcl/ios2met/makefile.mk | 2
goodies/source/filter.vcl/ipbm/makefile.mk | 2
goodies/source/filter.vcl/ipcd/makefile.mk | 2
goodies/source/filter.vcl/ipcx/makefile.mk | 2
goodies/source/filter.vcl/ipict/makefile.mk | 2
goodies/source/filter.vcl/ipsd/makefile.mk | 2
goodies/source/filter.vcl/iras/makefile.mk | 2
goodies/source/filter.vcl/itga/makefile.mk | 2
goodies/source/filter.vcl/itiff/makefile.mk | 2
goodies/source/inv/makefile.mk | 17
goodies/source/unographic/graphicuno.cxx | 13
goodies/util/makefile.mk | 2
i18npool/prj/d.lst | 2
i18npool/source/isolang/makefile.mk | 2
i18npool/source/registerservices/registerservices.cxx | 9
i18npool/util/makefile.mk | 2
i18nutil/prj/d.lst | 3
i18nutil/source/utility/makefile.mk | 15
idl/util/makefile.mk | 5
inc/insdlg.hxx | 0
inc/macros/registration.hxx | 0
inc/transbnd.hxx | 0
instsetoo_native/util/openoffice.lst | 6
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 8
lingucomponent/source/spellcheck/spell/makefile.mk | 8
lingucomponent/source/thesaurus/libnth/makefile.mk | 8
linguistic/source/makefile.mk | 12
msole/makefile.mk | 0
openoffice.org/cppcanvas/util/makefile.mk | 2
openoffice.org/dbaccess/util/makefile.mk | 29 -
openoffice.org/forms/util/makefile.mk | 13
openoffice.org/libsofficecheckpoint1/makefile.mk | 36 +
openoffice.org/libsofficecheckpoint1/prj/build.lst | 3
openoffice.org/libsofficecheckpoint1/prj/d.lst | 1
package/prj/build.lst | 2
package/prj/d.lst | 2
package/source/manifest/UnoRegister.cxx | 10
package/source/xstor/makefile.mk | 4
package/util/makefile.mk | 9
padmin/source/makefile.mk | 11
prj/build.lst | 2
prj/d.lst | 0
psprint/prj/d.lst | 2
psprint/util/makefile.mk | 2
regexp/source/makefile.mk | 2
rsc/prj/build.lst | 2
rsc/source/prj/makefile.mk | 6
sc/util/makefile.mk | 36 -
scaddins/source/analysis/makefile.mk | 4
scaddins/source/datefunc/makefile.mk | 4
sch/util/makefile.mk | 18
scp2/source/gnome/file_gnome.scp | 18
scp2/source/gnome/module_gnome.scp | 2
scp2/source/ooo/file_library_ooo.scp | 245 ----------
scp2/source/ooo/module_hidden_ooo.scp | 37 -
scripting/source/basprov/makefile.mk | 8
scripting/source/dlgprov/makefile.mk | 5
scripting/source/protocolhandler/makefile.mk | 4
scripting/source/stringresource/makefile.mk | 2
scripting/source/vbaevents/makefile.mk | 5
scripting/util/makefile.mk | 4
sd/prj/build.lst | 2
sd/source/filter/eppt/makefile.mk | 12
sd/util/makefile.mk | 45 -
sfx2/prj/build.lst | 2
sfx2/prj/d.lst | 3
sfx2/source/appl/appuno.cxx | 11
sfx2/util/makefile.mk | 70 ++
shell/prj/d.lst | 2
shell/source/backends/desktopbe/desktopbecdef.cxx | 13
shell/source/backends/desktopbe/makefile.mk | 12
shell/source/backends/gconfbe/gconfbecdef.cxx | 12
shell/source/backends/gconfbe/makefile.mk | 12
shell/source/backends/localebe/localebecdef.cxx | 12
shell/source/backends/localebe/makefile.mk | 12
shell/source/unix/sysshell/makefile.mk | 4
sj2/prj/d.lst | 2
sj2/util/makefile.mk | 6
slideshow/util/makefile.mk | 9
so3/inc/insdlg.hxx | 7
so3/inc/transbnd.hxx | 14
so3/prj/d.lst | 2
so3/source/dialog/insdlg.cxx | 4
so3/source/inplace/outplace.cxx | 1
so3/source/persist/transbnd.cxx | 3
so3/util/makefile.mk | 3
solenv/bin/modules/installer/configuration.pm | 4
solenv/bin/modules/installer/profiles.pm | 4
sot/prj/d.lst | 2
sot/source/unoolestorage/register.cxx | 9
sot/util/makefile.mk | 2
source/FileAccess.cxx | 0
source/X11/X11_service.cxx | 0
source/X11/makefile.mk | 0
source/abpilot/makefile.mk | 0
source/analysis/makefile.mk | 0
source/app/appinit.cxx | 0
source/app/makefile.mk | 0
source/app/svapp.cxx | 0
source/appl/appuno.cxx | 0
source/awt/vclxtoolkit.cxx | 0
source/awt/vclxwindow.cxx | 0
source/backendhelper/componentdf.cxx | 0
source/backendhelper/makefile.mk | 0
source/backends/desktopbe/desktopbecdef.cxx | 0
source/backends/desktopbe/makefile.mk | 0
source/backends/gconfbe/gconfbecdef.cxx | 0
source/backends/gconfbe/makefile.mk | 0
source/backends/localebe/localebecdef.cxx | 0
source/backends/localebe/makefile.mk | 0
source/basprov/makefile.mk | 0
source/bibliography/makefile.mk | 0
source/cairo/makefile.mk | 0
source/components/factory.cxx | 0
source/config/cache/makefile.mk | 0
source/controller/makefile.mk | 0
source/core/facreg.cxx | 0
source/core/makefile.mk | 0
source/core/ucbserv.cxx | 0
source/cpool/makefile.mk | 0
source/datefunc/makefile.mk | 0
source/dbpilots/makefile.mk | 0
source/dbtools/makefile.mk | 0
source/deployment/gui/makefile.mk | 0
source/deployment/makefile.mk | 0
source/deployment/misc/makefile.mk | 0
source/dialog/insdlg.cxx | 0
source/dlgprov/makefile.mk | 0
source/drivers/adabas/makefile.mk | 0
source/drivers/calc/makefile.mk | 0
source/drivers/dbase/makefile.mk | 0
source/drivers/evoab/makefile.mk | 0
source/drivers/evoab2/makefile.mk | 0
source/drivers/file/makefile.mk | 0
source/drivers/flat/makefile.mk | 0
source/drivers/hsqldb/makefile.mk | 0
source/drivers/jdbc/makefile.mk | 0
source/drivers/mysql/makefile.mk | 0
source/drivers/odbc/makefile.mk | 0
source/filter.vcl/egif/makefile.mk | 0
source/filter.vcl/eos2met/makefile.mk | 0
source/filter.vcl/epbm/makefile.mk | 0
source/filter.vcl/epgm/makefile.mk | 0
source/filter.vcl/epict/makefile.mk | 0
source/filter.vcl/eppm/makefile.mk | 0
source/filter.vcl/eps/makefile.mk | 0
source/filter.vcl/eras/makefile.mk | 0
source/filter.vcl/etiff/makefile.mk | 0
source/filter.vcl/expm/makefile.mk | 0
source/filter.vcl/icgm/makefile.mk | 0
source/filter.vcl/idxf/makefile.mk | 0
source/filter.vcl/ieps/makefile.mk | 0
source/filter.vcl/ios2met/makefile.mk | 0
source/filter.vcl/ipbm/makefile.mk | 0
source/filter.vcl/ipcd/makefile.mk | 0
source/filter.vcl/ipcx/makefile.mk | 0
source/filter.vcl/ipict/makefile.mk | 0
source/filter.vcl/ipsd/makefile.mk | 0
source/filter.vcl/iras/makefile.mk | 0
source/filter.vcl/itga/makefile.mk | 0
source/filter.vcl/itiff/makefile.mk | 0
source/filter/eppt/makefile.mk | 0
source/filter/migration/makefile.mk | 0
source/filter/xml/makefile.mk | 0
source/filtertracer/makefile.mk | 0
source/flash/makefile.mk | 0
source/fsstor/fsfactory.cxx | 0
source/fsstor/fsstorage.cxx | 0
source/fsstor/makefile.mk | 0
source/generic/makefile.mk | 0
source/gengal/makefile.mk | 0
source/gnome/file_gnome.scp | 0
source/gnome/module_gnome.scp | 0
source/hatchwindow/makefile.mk | 0
source/helper/registerservices.cxx | 0
source/helpprovider/makefile.mk | 0
source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 0
source/inplace/outplace.cxx | 0
source/inv/makefile.mk | 0
source/isolang/makefile.mk | 0
source/makefile.mk | 0
source/manager/makefile.mk | 0
source/manifest/UnoRegister.cxx | 0
source/migration/services/makefile.mk | 0
source/misc/configunoreg.cxx | 0
source/misc/facreg.cxx | 0
source/misc/unoservices.cxx | 0
source/model/makefile.mk | 0
source/msfilter/powerpoint/makefile.mk | 0
source/nsplugin/source/makefile.mk | 0
source/null/makefile.mk | 0
source/offacc/makefile.mk | 0
source/office/makefile.mk | 0
source/ooo/file_library_ooo.scp | 0
source/ooo/module_hidden_ooo.scp | 0
source/packer/makefile.mk | 0
source/passwordcontainer/makefile.mk | 0
source/pdf/makefile.mk | 0
source/persist/transbnd.cxx | 0
source/pkgchk/makefile.mk | 0
source/pkgchk/unopkg/makefile.mk | 0
source/platformbe/componentdefn.cxx | 0
source/platformbe/makefile.mk | 0
source/plugin/unx/makefile.mk | 0
source/plugin/util/makefile.mk | 0
source/preload/makefile.mk | 0
source/prj/makefile.mk | 0
source/productregistration/makefile.mk | 0
source/propctrlr/makefile.mk | 0
source/protocolhandler/makefile.mk | 0
source/register/register3rdcomponents.cxx | 0
source/register/registerservices.cxx | 0
source/register/registertemp.cxx | 0
source/registerservices/registerservices.cxx | 0
source/resource/makefile.mk | 0
source/scanner/makefile.mk | 0
source/service/makefile.mk | 0
source/so_comp/makefile.mk | 0
source/spellcheck/spell/makefile.mk | 0
source/splash/makefile.mk | 0
source/splash/services_spl.cxx | 0
source/stringresource/makefile.mk | 0
source/svg/makefile.mk | 0
source/thesaurus/libnth/makefile.mk | 0
source/tools/makefile.mk | 0
source/transform/makefile.mk | 0
source/treeview/makefile.mk | 0
source/ucbhelper/xtempfile.cxx | 0
source/ucp/expand/makefile.mk | 0
source/ucp/file/makefile.mk | 0
source/ucp/file/prov.cxx | 0
source/ucp/ftp/makefile.mk | 0
source/ucp/gvfs/makefile.mk | 0
source/ucp/gvfs/provider.cxx | 0
source/ucp/hierarchy/makefile.mk | 0
source/ucp/package/makefile.mk | 0
source/ucp/tdoc/makefile.mk | 0
source/ucp/webdav/makefile.mk | 0
source/unix/sysshell/makefile.mk | 0
source/uno/registerservices.cxx | 0
source/uno/sbservices.cxx | 0
source/unodialogs/textconversiondlgs/makefile.mk | 0
source/unographic/graphicuno.cxx | 0
source/unoolestorage/register.cxx | 0
source/unx/gnome/makefile.mk | 0
source/update/ui/makefile.mk | 0
source/utility/makefile.mk | 0
source/vcl/makefile.mk | 0
source/view/makefile.mk | 0
source/xine/makefile.mk | 0
source/xmlextract/makefile.mk | 0
source/xmlfilteradaptor/makefile.mk | 0
source/xmlfilterdetect/makefile.mk | 0
source/xsltdialog/makefile.mk | 0
source/xsltfilter/makefile.mk | 0
source/xstor/makefile.mk | 0
starmath/util/makefile.mk | 19
svtools/bmpmaker/makefile.mk | 8
svtools/prj/build.lst | 6
svtools/prj/d.lst | 3
svtools/source/fsstor/fsfactory.cxx | 10
svtools/source/fsstor/fsstorage.cxx | 2
svtools/source/fsstor/makefile.mk | 16
svtools/source/hatchwindow/makefile.mk | 4
svtools/source/passwordcontainer/makefile.mk | 3
svtools/source/productregistration/makefile.mk | 5
svtools/source/uno/registerservices.cxx | 10
svtools/uno/makefile.mk | 9
svtools/util/makefile.mk | 130 +----
svx/prj/build.lst | 2
svx/source/gengal/makefile.mk | 14
svx/source/unodialogs/textconversiondlgs/makefile.mk | 8
svx/util/makefile.mk | 33 -
sw/prj/build.lst | 2
sw/util/makefile.mk | 43 -
toolkit/prj/d.lst | 2
toolkit/source/awt/vclxtoolkit.cxx | 12
toolkit/source/awt/vclxwindow.cxx | 6
toolkit/source/helper/registerservices.cxx | 9
toolkit/util/makefile.mk | 3
tools/bootstrp/addexes2/makefile.mk | 2
tools/bootstrp/makefile.mk | 6
tools/prj/d.lst | 2
tools/util/makefile.mk | 2
transex3/source/makefile.mk | 37 -
ucb/prj/build.lst | 2
ucb/prj/d.lst | 2
ucb/source/core/makefile.mk | 19
ucb/source/core/ucbserv.cxx | 11
ucb/source/ucp/expand/makefile.mk | 2
ucb/source/ucp/file/makefile.mk | 2
ucb/source/ucp/file/prov.cxx | 11
ucb/source/ucp/ftp/makefile.mk | 2
ucb/source/ucp/gvfs/makefile.mk | 17
ucb/source/ucp/gvfs/provider.cxx | 11
ucb/source/ucp/hierarchy/makefile.mk | 5
ucb/source/ucp/package/makefile.mk | 5
ucb/source/ucp/tdoc/makefile.mk | 5
ucb/source/ucp/webdav/makefile.mk | 3
ucbhelper/prj/d.lst | 2
ucbhelper/util/makefile.mk | 2
uno/makefile.mk | 0
unotools/prj/d.lst | 2
unotools/source/ucbhelper/xtempfile.cxx | 10
unotools/util/makefile.mk | 2
unoxml/prj/build.lst | 2
unoxml/source/service/makefile.mk | 3
util/makefile.mk | 0
util/openoffice.lst | 0
uui/util/makefile.mk | 7
vcl/prj/d.lst | 3
vcl/source/app/svapp.cxx | 13
vcl/source/components/factory.cxx | 11
vcl/util/makefile.mk | 60 +-
vcl/workben/makefile.mk | 22
vos/util/makefile.mk | 3
workben/makefile.mk | 0
writerperfect/util/makefile.mk | 10
xmlhelp/source/helpprovider/makefile.mk | 3
xmlhelp/source/treeview/makefile.mk | 3
xmlhelp/util/makefile.mk | 4
xmloff/prj/build.lst | 2
xmloff/prj/d.lst | 3
xmloff/source/core/facreg.cxx | 9
xmloff/source/transform/makefile.mk | 10
xmloff/util/makefile.mk | 67 ++
xmlscript/prj/d.lst | 2
xmlscript/source/misc/unoservices.cxx | 10
xmlscript/util/makefile.mk | 3
xmlsecurity/util/makefile.mk | 21
481 files changed, 1095 insertions(+), 1986 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 openoffice.org-2.2.0.ooo53397.linkopt.patch
Index: openoffice.org-2.2.0.ooo53397.linkopt.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo53397.linkopt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.2.0.ooo53397.linkopt.patch 20 Mar 2007 14:32:14 -0000 1.4
+++ openoffice.org-2.2.0.ooo53397.linkopt.patch 30 Mar 2007 14:39:51 -0000 1.5
@@ -83,34 +83,6 @@
SHL1IMPLIB= basic
SHL1STDLIBS= \
-Index: bf_forms/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_forms/util/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
---- openoffice.org.orig/binfilter/bf_forms/util/makefile.mk 19 Jul 2006 13:14:05 -0000 1.7
-+++ openoffice.org/binfilter/bf_forms/util/makefile.mk 11 Mar 2007 12:48:23 -0000
-@@ -71,19 +71,11 @@
- $(ONELIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
-- $(TOOLSLIB) \
-- $(I18NISOLANGLIB) \
-- $(VCLLIB) \
-- $(SVTOOLLIB) \
-- $(SVLLIB) \
- $(BFSVXLIB) \
- $(LEGACYSMGRLIB) \
- $(VOSLIB) \
-- $(UNOTOOLSLIB) \
-- $(COMPHELPERLIB) \
- $(DBTOOLSLIB) \
-- $(TKLIB) \
-- $(SO2LIB)
-+ -lsoffice
-
- SHL1LIBS=$(LIB1TARGET)
- SHL1DEPN= $(LIB1TARGET) \
Index: bf_goodies/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_goodies/util/makefile.mk,v
@@ -128,94 +100,6 @@
$(SALLIB)
# --- Targets -------------------------------------------------------------
-Index: bf_linguistic/source/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_linguistic/source/makefile.mk,v
-retrieving revision 1.10
-diff -u -r1.10 makefile.mk
---- openoffice.org.orig/binfilter/bf_linguistic/source/makefile.mk 19 Jul 2006 13:14:22 -0000 1.10
-+++ openoffice.org/binfilter/bf_linguistic/source/makefile.mk 11 Mar 2007 12:48:23 -0000
-@@ -83,16 +83,10 @@
- $(CPPUHELPERLIB) \
- $(UNOLIB) \
- $(VOSLIB) \
-- $(TOOLSLIB) \
-- $(I18NISOLANGLIB) \
-- $(SVTOOLLIB) \
-- $(SVLLIB) \
-- $(VCLLIB) \
- $(BFSVXLIB) \
- $(LEGACYSMGRLIB) \
- $(SALLIB) \
-- $(UCBHELPERLIB) \
-- $(UNOTOOLSLIB)
-+ -lsoffice
-
- # build DLL
- SHL1LIBS= $(SLB)$/$(TARGET).lib
-Index: bf_offmgr/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_offmgr/util/makefile.mk,v
-retrieving revision 1.9
-diff -u -r1.9 makefile.mk
---- openoffice.org.orig/binfilter/bf_offmgr/util/makefile.mk 14 Nov 2006 11:59:14 -0000 1.9
-+++ openoffice.org/binfilter/bf_offmgr/util/makefile.mk 11 Mar 2007 12:48:23 -0000
-@@ -81,19 +81,12 @@
- SHL2STDLIBS+= \
- $(BFSVXLIB) \
- $(LEGACYSMGRLIB) \
-- $(BASICLIB) \
- $(BFGOODIESLIB) \
-- $(SVTOOLLIB) \
-- $(SVLLIB) \
-- $(VCLLIB) \
-- $(TOOLSLIB) \
-- $(UNOTOOLSLIB) \
-- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(VOSLIB) \
- $(SALLIB) \
-- $(SO2LIB)
-+ -lsoffice
-
- .IF "$(GUI)"=="WNT"
- SHL2STDLIBS += $(LIBPRE) advapi32.lib
-Index: bf_sc/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_sc/util/makefile.mk,v
-retrieving revision 1.16
-diff -u -r1.16 makefile.mk
---- openoffice.org.orig/binfilter/bf_sc/util/makefile.mk 14 Nov 2006 11:59:50 -0000 1.16
-+++ openoffice.org/binfilter/bf_sc/util/makefile.mk 11 Mar 2007 12:48:24 -0000
-@@ -81,26 +81,15 @@
-
- # dynamic libraries
- SHL1STDLIBS+= \
-- $(BASICLIB) \
- $(LEGACYSMGRLIB) \
-- $(SO2LIB) \
-- $(SVTOOLLIB) \
-- $(SVLLIB) \
- $(BFSVXLIB) \
- $(BFGOODIESLIB) \
- $(BFOFALIB) \
-- $(VCLLIB) \
-+ -lsoffice \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
-- $(COMPHELPERLIB) \
-- $(UCBHELPERLIB) \
-- $(TKLIB) \
- $(VOSLIB) \
- $(SALLIB) \
-- $(TOOLSLIB) \
-- $(I18NISOLANGLIB) \
-- $(UNOTOOLSLIB) \
-- $(SOTLIB) \
- $(BFXMLOFFLIB) \
- $(DBTOOLSLIB)
-
Index: bf_sch/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sch/util/makefile.mk,v
@@ -242,34 +126,6 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
-Index: bf_sd/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_sd/util/makefile.mk,v
-retrieving revision 1.10
-diff -u -r1.10 makefile.mk
---- openoffice.org.orig/binfilter/bf_sd/util/makefile.mk 14 Nov 2006 12:01:11 -0000 1.10
-+++ openoffice.org/binfilter/bf_sd/util/makefile.mk 11 Mar 2007 12:48:25 -0000
-@@ -109,19 +109,8 @@
- $(BFOFALIB) \
- $(BFSVXLIB) \
- $(LEGACYSMGRLIB) \
-- $(BASICLIB) \
- $(BFGOODIESLIB) \
-- $(SO2LIB) \
-- $(SVTOOLLIB) \
-- $(TKLIB) \
-- $(VCLLIB) \
-- $(SVLLIB) \
-- $(SOTLIB) \
-- $(UNOTOOLSLIB) \
-- $(TOOLSLIB) \
-- $(I18NISOLANGLIB) \
-- $(COMPHELPERLIB) \
-- $(UCBHELPERLIB) \
-+ -lsoffice \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(VOSLIB) \
Index: bf_starmath/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_starmath/util/makefile.mk,v
@@ -297,103 +153,6 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
-Index: bf_svx/util/makefile.mk
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_svx/util/makefile.mk,v
-retrieving revision 1.9
-diff -u -r1.9 makefile.mk
---- openoffice.org.orig/binfilter/bf_svx/util/makefile.mk 14 Nov 2006 12:06:32 -0000 1.9
-+++ openoffice.org/binfilter/bf_svx/util/makefile.mk 11 Mar 2007 12:48:28 -0000
-@@ -68,29 +68,16 @@
- SHL1BASE = 0x1d800000
-
- SHL1STDLIBS= \
-+ -lsoffice \
- $(BFXMLOFFLIB) \
- $(BFGOODIESLIB) \
-- $(BASICLIB) \
-- $(SO2LIB) \
-- $(SVTOOLLIB) \
-- $(TKLIB) \
-- $(VCLLIB) \
-- $(SVLLIB) \
-- $(SOTLIB) \
-- $(UNOTOOLSLIB) \
-- $(TOOLSLIB) \
[...10326 lines suppressed...]
+
+- static void FillObjectServerList( SvObjectServerList* );
++ static void FillObjectServerList( binfilter::SvObjectServerList* );
+
+ SvInPlaceObjectRef Execute( Window* pParent, SvStorage* pStor,
+- const SvObjectServerList* pServers = NULL );
++ const binfilter::SvObjectServerList* pServers = NULL );
+ const String& GetFileName() const { return _aFileName; }
+ BOOL IsCreateNew() const { return _bCreateNew; }
+ BOOL IsLinked() const { return _bLink; }
+Index: inc/transbnd.hxx
===================================================================
-RCS file: /cvs/gsl/toolkit/source/awt/vclxtoolkit.cxx,v
-retrieving revision 1.53
-diff -u -r1.53 vclxtoolkit.cxx
---- openoffice.org.orig/toolkit/source/awt/vclxtoolkit.cxx 20 Dec 2006 13:52:30 -0000 1.53
-+++ openoffice.org/toolkit/source/awt/vclxtoolkit.cxx 20 Mar 2007 11:01:15 -0000
-@@ -249,6 +249,8 @@
- #include <comphelper/processfactory.hxx>
- #endif
+RCS file: /cvs/oi/so3/inc/transbnd.hxx,v
+retrieving revision 1.5
+diff -u -r1.5 transbnd.hxx
+--- openoffice.org.orig/so3/inc/transbnd.hxx 24 Oct 2006 14:13:26 -0000 1.5
++++ openoffice.org/so3/inc/transbnd.hxx 30 Mar 2007 11:15:10 -0000
+@@ -86,8 +86,13 @@
+ class SvBindStatusCallback;
+ SV_DECL_REF(SvBindStatusCallback)
-+#include <dlfcn.h>
++namespace binfilter
++{
+ class SvKeyValueIterator;
+ SV_DECL_REF(SvKeyValueIterator)
++}
+
- namespace css = ::com::sun::star;
++using namespace ::binfilter;
- #define VCLWINDOW_FRAMEWINDOW 0x1000
-@@ -1089,15 +1091,7 @@
- // and we need to stay compatible)
- // try to load the lib
- if ( !fnSvtCreateWindow && !hSvToolsLib )
-- {
-- ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "svt", TRUE );
-- hSvToolsLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
-- if ( hSvToolsLib )
-- {
-- ::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM( "CreateWindow" ) );
-- fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol( hSvToolsLib, aFunctionName.pData );
-- }
-- }
-+ fnSvtCreateWindow = (FN_SvtCreateWindow)dlsym(RTLD_DEFAULT, "CreateWindow" );
- // ask the SvTool creation function
- if ( fnSvtCreateWindow )
- pNewWindow = fnSvtCreateWindow( &pNewComp, &rDescriptor, pParent, nWinBits );
+ #ifndef COPYCTOR_API
+ #define COPYCTOR_API(C) C (const C&); C& operator= (const C&)
+@@ -112,7 +117,7 @@
+ ErrCode m_eErrCode;
+ String m_aMime;
+ DateTime m_aExpires;
+- SvKeyValueIteratorRef m_xHeadIter;
++ binfilter::SvKeyValueIteratorRef m_xHeadIter;
+ SvLockBytesRef m_xLockBytes;
+
+ BOOL m_bStarted : 1;
+@@ -228,8 +233,8 @@
+
+ /** Headers (HTTP).
+ */
+- SvKeyValueIteratorRef GetHeaders (void) const;
+- void SetHeaders (SvKeyValueIteratorRef &rxHeadIter);
++ binfilter::SvKeyValueIteratorRef GetHeaders (void) const;
++ void SetHeaders (binfilter::SvKeyValueIteratorRef &rxHeadIter);
+
+ /** Priority.
+ */
+@@ -390,6 +395,8 @@
+ * SvKeyValueIterator.
+ *
+ *======================================================================*/
++namespace binfilter
++{
+ class SvKeyValueList_Impl;
+ class SO3_DLLPUBLIC SvKeyValueIterator : public SvRefBase
+ {
+@@ -416,6 +423,7 @@
+ };
+
+ SV_IMPL_REF(SvKeyValueIterator);
++}
+
+ /*========================================================================
+ *
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/oi/so3/prj/d.lst,v
+retrieving revision 1.15
+diff -u -r1.15 d.lst
+--- openoffice.org.orig/so3/prj/d.lst 24 Oct 2006 14:13:58 -0000 1.15
++++ openoffice.org/so3/prj/d.lst 30 Mar 2007 11:15:10 -0000
+@@ -12,6 +12,8 @@
+ ..\%__SRC%\bin\so?????.sym %_DEST%\bin%_EXT%\so?????.sym
+ ..\%__SRC%\misc\so?????.map %_DEST%\bin%_EXT%\so?????.map
+
++..\%__SRC%\lib\liblinkopt.*.a %_DEST%\lib%_EXT%\liblinkopt.*.a
++
+ mkdir: %_DEST%\inc%_EXT%\so3
+ hedabu: ..\inc\so2defs.hxx %_DEST%\inc%_EXT%\so3\so2defs.hxx
+ hedabu: ..\inc\soimpl.hxx %_DEST%\inc%_EXT%\so3\soimpl.hxx
+Index: source/dialog/insdlg.cxx
+===================================================================
+RCS file: /cvs/oi/so3/source/dialog/insdlg.cxx,v
+retrieving revision 1.20
+diff -u -r1.20 insdlg.cxx
+--- openoffice.org.orig/so3/source/dialog/insdlg.cxx 12 Oct 2006 10:57:28 -0000 1.20
++++ openoffice.org/so3/source/dialog/insdlg.cxx 30 Mar 2007 11:15:11 -0000
+@@ -96,6 +96,7 @@
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+ using namespace ::rtl;
++using namespace ::binfilter;
+ using namespace ::com::sun::star::container;
+ using namespace ::com::sun::star::ui::dialogs;
+
+@@ -104,6 +105,8 @@
+
+ #define SoResid( id ) ResId( id, SOAPP->GetResMgr() )
+
++namespace binfilter
++{
+ /********************** SvObjectServerList ********************************
+ **************************************************************************/
+ PRV_SV_IMPL_OWNER_LIST( SvObjectServerList, SvObjectServer )
+@@ -234,6 +237,7 @@
+ catch(...)
+ {
+ }
++}
+ }
+
+ // class SvInsertOleDlg --------------------------------------------------
+Index: source/inplace/outplace.cxx
+===================================================================
+RCS file: /cvs/oi/so3/source/inplace/outplace.cxx,v
+retrieving revision 1.32
+diff -u -r1.32 outplace.cxx
+--- openoffice.org.orig/so3/source/inplace/outplace.cxx 14 Nov 2006 14:12:08 -0000 1.32
++++ openoffice.org/so3/source/inplace/outplace.cxx 30 Mar 2007 11:15:12 -0000
+@@ -83,6 +83,7 @@
+ using namespace vos;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::datatransfer;
++using namespace ::binfilter;
+
+ static UINT32 nUniqueId = 1;
+ #ifdef WNT
+Index: source/persist/transbnd.cxx
+===================================================================
+RCS file: /cvs/oi/so3/source/persist/transbnd.cxx,v
+retrieving revision 1.9
+diff -u -r1.9 transbnd.cxx
+--- openoffice.org.orig/so3/source/persist/transbnd.cxx 12 Oct 2006 11:00:50 -0000 1.9
++++ openoffice.org/so3/source/persist/transbnd.cxx 30 Mar 2007 11:15:12 -0000
+@@ -806,6 +806,8 @@
+ m_bDonePending = TRUE;
+ }
+
++namespace binfilter
++{
+ /*========================================================================
+ *
+ * SvKeyValueIterator implementation.
+@@ -864,6 +866,7 @@
+ {
+ SvKeyValue *pKeyVal = new SvKeyValue (rKeyVal);
+ m_pList->C40_INSERT(SvKeyValue, pKeyVal, m_pList->Count());
++}
+ }
+
+ /*========================================================================
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/oi/so3/util/makefile.mk,v
+retrieving revision 1.15
+diff -u -r1.15 makefile.mk
+--- openoffice.org.orig/so3/util/makefile.mk 24 Oct 2006 14:15:42 -0000 1.15
++++ openoffice.org/so3/util/makefile.mk 30 Mar 2007 11:15:12 -0000
+@@ -75,7 +75,8 @@
+ RESLIB1SRSFILES= $(SRS)$/src.srs
+ .ENDIF
+
+-SHL1TARGET= so$(UPD)$(DLLPOSTFIX)
++#SHL1TARGET= so$(UPD)$(DLLPOSTFIX)
++LIB1ARCHIV= $(LB)$/liblinkopt.so.a
+ SHL1IMPLIB= so2
+ SHL1STDLIBS=\
+ $(SVTOOLLIB) \
openoffice.org-2.2.0.rh232389.tango.patch:
inc/settings.mk | 0
jaminc/settings.jam | 0
solenv/inc/settings.mk | 2 +-
solenv/jaminc/settings.jam | 2 +-
svtools/inc/imgdef.hxx | 3 +--
svtools/source/config/miscopt.cxx | 6 ++----
svx/source/dialog/optgdlg.cxx | 10 ++++------
svx/source/dialog/optgdlg.src | 2 --
vcl/inc/settings.hxx | 7 +++----
vcl/source/app/settings.cxx | 15 ++++++---------
vcl/source/window/toolbox2.cxx | 4 ++--
11 files changed, 20 insertions(+), 31 deletions(-)
Index: openoffice.org-2.2.0.rh232389.tango.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.rh232389.tango.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.2.0.rh232389.tango.patch 29 Mar 2007 12:29:34 -0000 1.3
+++ openoffice.org-2.2.0.rh232389.tango.patch 30 Mar 2007 14:39:51 -0000 1.4
@@ -172,3 +172,35 @@
< "Crystal" ; > ;
};
};
+Index: inc/settings.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/settings.mk,v
+retrieving revision 1.205.32.2
+diff -u -r1.205.32.2 settings.mk
+--- openoffice.org.orig/solenv/inc/settings.mk 16 Jan 2007 08:33:58 -0000 1.205.32.2
++++ openoffice.org/solenv/inc/settings.mk 30 Mar 2007 14:36:30 -0000
+@@ -995,7 +995,7 @@
+ .ENDIF
+
+ # additional image sets
+-CUSTOM_IMAGE_SETS=hicontrast industrial crystal
++CUSTOM_IMAGE_SETS=hicontrast tango crystal
+
+ # settings for mozilla idl compiler
+ XPIDL=xpidl
+Index: jaminc/settings.jam
+===================================================================
+RCS file: /cvs/tools/solenv/jaminc/settings.jam,v
+retrieving revision 1.3
+diff -u -r1.3 settings.jam
+--- openoffice.org.orig/solenv/jaminc/settings.jam 5 Oct 2006 16:22:36 -0000 1.3
++++ openoffice.org/solenv/jaminc/settings.jam 30 Mar 2007 14:36:31 -0000
+@@ -1070,7 +1070,7 @@
+ # additional image sets
+ CUSTOM_IMAGE_SETS =
+ hicontrast
+- industrial
++ tango
+ crystal
+ ;
+ # settings for mozilla idl compiler
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -r1.1130 -r1.1131
--- openoffice.org.spec 30 Mar 2007 10:01:02 -0000 1.1130
+++ openoffice.org.spec 30 Mar 2007 14:39:51 -0000 1.1131
@@ -1320,6 +1320,9 @@
#remove dummy .dat files
rm -f $RPM_BUILD_ROOT/%{instdir}/program/root?.dat
+#remove ancient icons in favour of tango
+ln -sf $RPM_BUILD_ROOT/%{instdir}/share/config/images_tango.zip $RPM_BUILD_ROOT//%{instdir}/share/config/images.zip
+
#set standard permissions for rpmlint
find $RPM_BUILD_ROOT/%{instdir} -exec chmod +w {} \;
@@ -1904,7 +1907,6 @@
%dir %{instdir}/share/config
%{instdir}/share/config/images.zip
%{instdir}/share/config/images_crystal.zip
-%{instdir}/share/config/images_hicontrast.zip
%{instdir}/share/config/images_tango.zip
%{instdir}/share/config/javavendors.xml
%{instdir}/share/config/psetup.xpm
More information about the fedora-cvs-commits
mailing list