rpms/openoffice.org/devel libtextcat.xcu, NONE, 1.1 openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch, NONE, 1.1 openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch, NONE, 1.1 workspace.npower7.patch, NONE, 1.1 .cvsignore, 1.130, 1.131 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.6, 1.7 openoffice.org-1.9.115.ooo51931.fixxmlsec.patch, 1.2, 1.3 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.17, 1.18 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.19, 1.20 openoffice.org-1.9.97.rh156067.noversionedsysui.patch, 1.1, 1.2 openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch, 1.1, 1.2 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.15, 1.16 openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch, 1.1, 1.2 openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.14, 1.15 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.32, 1.33 openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch, 1.1, 1.2 openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, 1.1, 1.2 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.3, 1.4 openoffice.org-2.2.0.rh232389.tango.patch, 1.4, 1.5 openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.4, 1.5 openoffice.org.spec, 1.1243, 1.1244 pseudoworkspace.valgrind1.patch, 1.18, 1.19 sources, 1.242, 1.243 workspace.configrefactor01.patch, 1.2, 1.3 workspace.fpicker6.patch, 1.3, 1.4 workspace.tl37.patch, 1.2, 1.3 workspace.unifysound01.patch, 1.8, 1.9 ooobuild.VBAObjects.patch, 1.15, NONE openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch, 1.7, NONE openoffice.org-2.0.3.rh187919.gtkunderkde.patch, 1.3, NONE openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch, 1.6, NONE openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch, 1.1, NONE openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch, 1.1, NONE openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch, 1.1, NONE openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, 1.5, NONE openoffice.org-2.2.0.ooo74401.basctl.boost.patch, 1.2, NONE openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch, 1.1, NONE openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, 1.1, NONE openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch, 1.2, NONE openoffice.org-2.2.0.ooo75329.xdguserdir.patch, 1.1, NONE openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch, 1.1, NONE openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch, 1.2, NONE openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch, 1.1, NONE openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch, 1.1, NONE openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch, 1.1, NONE openoffice.org-2.2.1.ooo78921.sw.embedded.patch, 1.1, NONE openoffice.org.ooo79953.dbusinhibitscreensaver.patch, 1.2, NONE workspace.cmcfixes34.patch, 1.1, NONE workspace.glyphadv.patch, 1.1, NONE workspace.libxslt02.patch, 1.6, NONE workspace.ppc64one.patch, 1.6, NONE workspace.sixtyfour11.patch, 1.6, NONE workspace.thbpp6.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Aug 16 07:05:05 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771
Modified Files:
.cvsignore openoffice.org-1.9.114.rh161886.rpath.desktop.patch
openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-1.9.97.rh156067.noversionedsysui.patch
openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org-2.2.0.rh232389.tango.patch
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
openoffice.org.spec pseudoworkspace.valgrind1.patch sources
workspace.configrefactor01.patch workspace.fpicker6.patch
workspace.tl37.patch workspace.unifysound01.patch
Added Files:
libtextcat.xcu
openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch
openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch
workspace.npower7.patch
Removed Files:
ooobuild.VBAObjects.patch
openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
openoffice.org-2.0.3.rh187919.gtkunderkde.patch
openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
openoffice.org-2.2.0.ooo74401.basctl.boost.patch
openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
openoffice.org-2.2.0.ooo75329.xdguserdir.patch
openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
openoffice.org-2.2.1.ooo78921.sw.embedded.patch
openoffice.org.ooo79953.dbusinhibitscreensaver.patch
workspace.cmcfixes34.patch workspace.glyphadv.patch
workspace.libxslt02.patch workspace.ppc64one.patch
workspace.sixtyfour11.patch workspace.thbpp6.patch
Log Message:
first cut at 2.3.0
--- NEW FILE libtextcat.xcu ---
<?xml version='1.0' encoding='UTF-8'?>
<oor:component-data oor:name="Paths" oor:package="org.openoffice.Office" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="Paths">
<node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
<node oor:name="file:///usr/share/libtextcat" oor:op="fuse" />
</node>
</node>
</node>
</oor:component-data>
openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch:
--- NEW FILE openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch ---
Index: ViewsWindow.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/report/ViewsWindow.cxx,v
retrieving revision 1.4
diff -u -r1.4 ViewsWindow.cxx
--- openoffice.org.orig/reportdesign/source/ui/report/ViewsWindow.cxx 3 Aug 2007 12:46:04 -0000 1.4
+++ openoffice.org/reportdesign/source/ui/report/ViewsWindow.cxx 15 Aug 2007 18:40:58 -0000
@@ -866,7 +866,7 @@
const SdrMark* pM = pView->GetSdrMarkByIndex(i);
SdrObject* pObj = pM->GetMarkedSdrObj();
Rectangle aObjRect(_bBoundRects ? pObj->GetCurrentBoundRect() : pObj->GetSnapRect());
- _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::data_type(pObj,pView)));
+ _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::mapped_type(pObj,pView)));
}
}
}
openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch:
--- NEW FILE openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch ---
Index: source/core/undo/unattr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/undo/unattr.cxx,v
retrieving revision 1.15
diff -u -r1.15 unattr.cxx
--- openoffice.org.orig/sw/source/core/undo/unattr.cxx 26 Jul 2007 08:20:06 -0000 1.15
+++ openoffice.org/sw/source/core/undo/unattr.cxx 15 Aug 2007 14:59:15 -0000
@@ -189,11 +189,11 @@
mbIsCounted( bIsCounted )
{}
- const ULONG mnTxtNodeIdx;
- const int mnNumLvl;
- const bool mbIsRestart;
- const SwNodeNum::tSwNumTreeNumber mnRestartVal;
- const bool mbIsCounted;
+ ULONG mnTxtNodeIdx;
+ int mnNumLvl;
+ bool mbIsRestart;
+ SwNodeNum::tSwNumTreeNumber mnRestartVal;
+ bool mbIsCounted;
};
// <--
workspace.npower7.patch:
--- NEW FILE workspace.npower7.patch ---
Index: sc/sc/source/ui/vba/vbahelper.hxx
diff -u sc/sc/source/ui/vba/vbahelper.hxx:1.2 sc/sc/source/ui/vba/vbahelper.hxx:1.2.2.1
--- sc/sc/source/ui/vba/vbahelper.hxx:1.2 Wed Apr 25 09:07:33 2007
+++ sc/sc/source/ui/vba/vbahelper.hxx Thu May 3 04:16:34 2007
@@ -38,8 +38,8 @@
#include <com/sun/star/frame/XModel.hpp>
#include <docsh.hxx>
-#define css com::sun::star
-#define oo org::openoffice
+namespace css = ::com::sun::star;
+
namespace org
{
namespace openoffice
@@ -69,6 +69,8 @@
}
}
+namespace oo = org::openoffice;
+
#ifdef DEBUG
# define SC_VBA_FIXME(a) OSL_TRACE( a )
# define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sc/sc/util/makefile.mk,v
retrieving revision 1.41
diff -u -r1.41 makefile.mk
--- openoffice.org.orig/sc/util/makefile.mk 22 May 2007 20:15:40 -0000 1.41
+++ openoffice.org/sc/util/makefile.mk 15 Aug 2007 15:10:15 -0000
@@ -277,6 +277,7 @@
$(SVTOOLLIB) \
$(SVLLIB) \
$(ISCLIB) \
+ $(VCLLIB)
SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- .cvsignore 31 May 2007 11:05:10 -0000 1.130
+++ .cvsignore 16 Aug 2007 07:04:22 -0000 1.131
@@ -1,39 +1,3 @@
-OOO_1_1_2.tar.bz2
-bg_BG.zip
-ca_ES.zip
-da_DK.zip
-de_AT.zip
-de_CH.zip
-de_DE_comb.zip
-el_GR.zip
-en_AU.zip
-en_CA.zip
-en_NZ.zip
-es_ES.zip
-es_MX.zip
-fr_BE.zip
-fr_FR.zip
-hr_HR.zip
-hu_HU.zip
-hyph_de_CH.zip
-hyph_en_CA.zip
-hyph_es_ES.zip
-hyph_fr_BE.zip
-hyph_fr_FR.zip
-hyph_hu_HU.zip
-hyph_nl_NL.zip
-hyph_pl_PL.zip
-hyph_pt_BR.zip
-hyph_pt_PT.zip
-hyph_sk_SK.zip
-hyph_sl.zip
-hyph_sv_SE.zip
-hyph_uk.zip
-la.zip
-nb_NO.zip
-nl_NL.zip
-nn_NO.zip
-ooo-build-1.1.61pre.tar.bz2
ooo-icons-bluecurve-OOO_1_1-9.tar.gz
openoffice-gallery-extra.tar.bz2
openoffice-png48x48.tar.bz2
@@ -129,81 +93,17 @@
SRC680_m123.tar.bz2
UseSystemFPicker.xcu
RegisterAndLicence.xcu
-SRC680_m124.tar.bz2
-SRC680_m125.tar.bz2
-opens___.ttf
-SRC680_m126.tar.bz2
-SRC680_m127.tar.bz2
-SRC680_m128.tar.bz2
GSI_ga.sdf
javavendors.xml
-SRC680_m129.tar.bz2
-SRC680_m130.tar.bz2
-OOO680_m1.tar.bz2
-OOO680_m2.tar.bz2
-OOO680_m3.tar.bz2
GSI_hi-IN.sdf
-SRC680_m138.tar.bz2
-SRC680_m139.tar.bz2
-SRC680_m140.tar.bz2
-SRC680_m141.tar.bz2
-SRC680_m142.tar.bz2
-SRC680_m143.tar.bz2
-SRC680_m144.tar.bz2
-SRC680_m145.tar.bz2
evolocal.odb
-OOA680_m1.tar.bz2
documentation.openoffice.org-templates.tar.gz
redhat-templates.tar.gz
Tigert-templates.tar.gz
-OOB680_m1.tar.bz2
-OOB680_m2.tar.bz2
-OOB680_m3.tar.bz2
-OOB680_m4.tar.bz2
-OOB680_m5.tar.bz2
-openoffice.org-dict-cs_CZ.tar.gz
ooo64726.sdf
-SRC680_m166.tar.bz2
-SRC680_m167.tar.bz2
-SRC680_m168.tar.bz2
AutoSaveCommon.xcu
AutoSaveRecovery.xcu
-WriterZoom.xcu
-WriterRightPanel.xcu
-SRC680_m169.tar.bz2
-OOC680_m1.tar.bz2
-OOC680_m2.tar.bz2
-OOC680_m3.tar.bz2
-OOC680_m4.tar.bz2
-OOC680_m5.tar.bz2
-OOC680_m6.tar.bz2
-OOC680_m7.tar.bz2
openoffice.org.langpack.template.tar.gz
pa-IN-179.sdf
-OOD680_m1.tar.bz2
-OOD680_m2.tar.bz2
-OOD680_m3.tar.bz2
-OOD680_m4.tar.bz2
-OOD680_m5.tar.bz2
-OOE680_m1.tar.bz2
-OOE680_m2.tar.bz2
-OOE680_m3.tar.bz2
-OOE680_m4.tar.bz2
-OOE680_m5.tar.bz2
-OOE680_m6.tar.bz2
-OOF680_m1.tar.bz2
-OOF680_m2.tar.bz2
-OOF680_m3.tar.bz2
-OOF680_m4.tar.bz2
-OOF680_m5.tar.bz2
-OOF680_m6.tar.bz2
-OOF680_m7.tar.bz2
unowinreg.dll
-OOF680_m10.tar.bz2
-OOF680_m11.tar.bz2
-OOF680_m12.tar.bz2
-OOF680_m13.tar.bz2
-OOF680_m14.tar.bz2
-OOF680_m16.tar.bz2
-OOF680_m17.tar.bz2
-OOF680_m18.tar.bz2
+OOG680_m1.tar.bz2
openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch 23 May 2007 12:55:44 -0000 1.6
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch 16 Aug 2007 07:04:22 -0000 1.7
@@ -5,7 +5,7 @@
diff -u -p -r1.17 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17
+++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000
-@@ -79,81 +79,6 @@
+@@ -77,96 +79,6 @@
# change back directory
cd "$sd_cwd"
@@ -19,8 +19,23 @@
-
-# set search path for shared libraries
-add_moz_lib=
--for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
-- test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break;
+-for moz_lib_path in \
+- $MOZILLA_LIBRARY_PATH \
+- /usr/lib \
+- /usr/lib/mozilla \
+- /usr/lib/mozilla-firefox \
+- /usr/lib/mozilla-thunderbird \
+- /opt/mozilla/lib \
+- /opt/MozillaFirefox/lib \
+- /opt/MozillaThunderbird/lib; \
+-do
+- if [ -f $moz_lib_path/libnss3.so ]; then
+- case "$moz_lib_path" in
+- /usr/lib|/usr/lib64) : ;;
+- *) add_moz_lib=":$moz_lib_path"
+- esac
+- break
+- fi
-done
-case $sd_platform in
- AIX)
@@ -37,7 +52,7 @@
-
- Darwin)
- # this is a temporary hack until we can live with the default search paths
-- if [ $DYLD_LIBRARY_PATH ]; then
+- if [ "$DYLD_LIBRARY_PATH" ]; then
- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
- export SYSTEM_DYLD_LIBRARY_PATH
- DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
@@ -87,7 +102,7 @@
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
for arg in $@
-@@ -167,23 +92,11 @@
+@@ -180,23 +92,11 @@
if [ -x "$sd_prog/javaldx" ] ; then
java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
if [ "$java_ld_library_path" != "" ] ; then
@@ -108,11 +123,11 @@
- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
- ;;
- esac
-+ if [ $LD_LIBRARY_PATH ]; then
-+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-+ else
-+ LD_LIBRARY_PATH=${java_ld_library_path}
-+ fi
++ if [ $LD_LIBRARY_PATH ]; then
++ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++ else
++ LD_LIBRARY_PATH=${java_ld_library_path}
++ fi
fi
fi
openoffice.org-1.9.115.ooo51931.fixxmlsec.patch:
Index: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.115.ooo51931.fixxmlsec.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.115.ooo51931.fixxmlsec.patch 14 Aug 2006 15:07:27 -0000 1.2
+++ openoffice.org-1.9.115.ooo51931.fixxmlsec.patch 16 Aug 2007 07:04:22 -0000 1.3
@@ -5,15 +5,20 @@
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/libxmlsec/makefile.mk 31 Jan 2006 18:27:29 -0000 1.8
+++ openoffice.org/libxmlsec/makefile.mk 10 Aug 2006 13:55:31 -0000
-@@ -133,12 +133,12 @@
+@@ -157,16 +157,16 @@
OUTDIR2INC=include$/xmlsec
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libxmlsec1.*dylib src$/nss$/.libs$/libxmlsec1-nss.*dylib
+OUT2LIB+=src$/.libs$/liboldxmlsec1.*dylib src$/nss$/.libs$/liboldxmlsec1-nss.*dylib
.ELIF "$(OS)"=="WNT"
+ .IF "$(COM)"=="GCC"
+-OUT2BIN+=src$/.libs$/libxmlsec1-1.dll src$/nss$/.libs$/libxmlsec1-nss-1.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto-1.dll
++OUT2BIN+=src$/.libs$/liboldxmlsec1-1.dll src$/nss$/.libs$/liboldxmlsec1-nss-1.dll src$/mscrypto$/.libs$/liboldxmlsec1-mscrypto-1.dll
+ .ELSE
OUT2LIB+=win32$/binaries$/*.lib
OUT2BIN+=win32$/binaries$/*.dll
+ .ENDIF
.ELSE
-OUT2LIB+=src$/.libs$/libxmlsec1.so* src$/nss$/.libs$/libxmlsec1-nss.so*
+OUT2LIB+=src$/.libs$/liboldxmlsec1.so* src$/nss$/.libs$/liboldxmlsec1-nss.so*
@@ -463,14 +468,28 @@
diff -u -r1.98 libs.mk
--- openoffice.org.orig/solenv/inc/libs.mk 7 Apr 2006 14:23:23 -0000 1.98
+++ openoffice.org/solenv/inc/libs.mk 10 Aug 2006 13:42:25 -0000
-@@ -131,8 +131,8 @@
- XPLIB=-l_xp
+@@ -149,11 +149,11 @@
TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+-XMLSECLIB=-lxmlsec1-1
+-XMLSECLIB-NSS=-lxmlsec1-nss-1
++XMLSECLIB=-loldxmlsec1-1
++XMLSECLIB-NSS=-loldxmlsec1-nss-1
+ .ELSE # "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB=-lxmlsec1
-XMLSECLIB-NSS=-lxmlsec1-nss
+XMLSECLIB=-loldxmlsec1
+XMLSECLIB-NSS=-loldxmlsec1-nss
- LIBXML2LIB=-lxml2
- NSS3LIB=-lnss3
- NSPR4LIB=-lnspr4
+ .ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ LIBXML2LIB=-lxml2-2
+@@ -165,7 +165,7 @@
+ PLC4LIB=-lplc4
+ NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+-XMLSECLIB-MS=-lxmlsec1-mscrypto-1
++XMLSECLIB-MS=-loldxmlsec1-mscrypto-1
+ MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB) $(ADVAPI32LIB)
+ .ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+ BROOKERLIB=-lbrooker$(OFFICEUPD)$(DLLPOSTFIX)
openoffice.org-1.9.129.ooo54603.fontconfig.patch:
Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch 14 Aug 2007 12:38:46 -0000 1.17
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 16 Aug 2007 07:04:22 -0000 1.18
@@ -1,6 +1,6 @@
diff -ru OOE680_m6.fontconfig/vcl/inc/outdev.h OOE680_m6/vcl/inc/outdev.h
---- OOE680_m6.fontconfig/vcl/inc/outdev.h 2006-12-18 13:00:23.000000000 -0500
-+++ OOE680_m6/vcl/inc/outdev.h 2006-12-19 04:28:08.000000000 -0500
+--- OOE680_m6.fontconfig/vcl/inc/vcl/outdev.h 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/vcl/outdev.h 2006-12-19 04:28:08.000000000 -0500
@@ -213,7 +213,7 @@
const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
ImplFontEntry* GetFallback( ImplDevFontList* pFontList,
@@ -11,8 +11,8 @@
void Invalidate();
};
diff -ru OOE680_m6.fontconfig/vcl/inc/outfont.hxx OOE680_m6/vcl/inc/outfont.hxx
---- OOE680_m6.fontconfig/vcl/inc/outfont.hxx 2006-12-18 13:00:23.000000000 -0500
-+++ OOE680_m6/vcl/inc/outfont.hxx 2006-12-19 04:27:48.000000000 -0500
+--- OOE680_m6.fontconfig/vcl/inc/vcl/outfont.hxx 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/vcl/outfont.hxx 2006-12-19 04:27:48.000000000 -0500
@@ -230,6 +230,7 @@
ImplDevFontListData* FindFontFamily( const String& rFontName ) const;
ImplDevFontListData* ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplFontSubstEntry* pDevSpecificSubst ) const;
@@ -50,8 +50,8 @@
diff -ru OOE680_m6.fontconfig/vcl/inc/sallayout.hxx OOE680_m6/vcl/inc/sallayout.hxx
---- OOE680_m6.fontconfig/vcl/inc/sallayout.hxx 2006-12-18 13:00:23.000000000 -0500
-+++ OOE680_m6/vcl/inc/sallayout.hxx 2006-12-19 04:28:08.000000000 -0500
+--- OOE680_m6.fontconfig/vcl/inc/vcl/sallayout.hxx 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/vcl/sallayout.hxx 2006-12-19 04:28:08.000000000 -0500
@@ -101,6 +101,7 @@
bool GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) const;
bool GetNextPos( int* nCharPos, bool* bRTL );
@@ -621,15 +621,15 @@
diff -ru OOE680_m6.fontconfig/vcl/source/window/window.cxx OOE680_m6/vcl/source/window/window.cxx
--- OOE680_m6.fontconfig/vcl/source/window/window.cxx 2006-12-18 13:00:26.000000000 -0500
+++ OOE680_m6/vcl/source/window/window.cxx 2006-12-19 04:27:48.000000000 -0500
-@@ -200,6 +200,7 @@
+@@ -201,6 +201,7 @@
#endif
- #include <pdfextoutdevdata.hxx>
+ #include <vcl/pdfextoutdevdata.hxx>
+#include <psprint/fontmanager.hxx>
- #include "lazydelete.hxx"
+ #include "vcl/lazydelete.hxx"
using namespace rtl;
-@@ -342,6 +343,10 @@
+@@ -347,6 +348,10 @@
bool Window::ImplCheckUIFont( const Font& rFont )
{
@@ -665,18 +665,20 @@
#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-@@ -413,7 +416,10 @@
+@@ -413,7 +416,11 @@
std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+- mutable FontCache* m_pFontCache;
+ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontconfigNameToLocalized;
+
- mutable FontCache* m_pFontCache;
++ mutable FontCache* m_pFontCache;
+ bool m_bFontconfigSuccess;
++
+ mutable std::vector< fontID > m_aOverrideFonts;
rtl::OString getAfmFile( PrintFont* pFont ) const;
- rtl::OString getFontFile( PrintFont* pFont ) const;
-@@ -724,6 +730,11 @@
+@@ -737,6 +744,11 @@
false else
*/
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
@@ -1380,8 +1382,8 @@
// fill XLFD aliases from fonts.alias files
initFontsAlias();
diff -ru vcl/inc/sallayout.hxx vcl/inc/sallayout.hxx
---- openoffice.org.orig/vcl/inc/sallayout.hxx 2007-01-11 10:26:04.000000000 +0000
-+++ openoffice.org/vcl/inc/sallayout.hxx 2007-01-11 10:32:50.000000000 +0000
+--- openoffice.org.orig/vcl/inc/vcl/sallayout.hxx 2007-01-11 10:26:04.000000000 +0000
++++ openoffice.org/vcl/inc/vcl/sallayout.hxx 2007-01-11 10:32:50.000000000 +0000
@@ -281,6 +281,8 @@
ImplFontData* GetFallbackFontData( int nFallbackLevel ) const
{ return mpFallbackFonts[ nFallbackLevel ]; }
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 28 Jun 2007 14:04:29 -0000 1.19
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 16 Aug 2007 07:04:22 -0000 1.20
@@ -87,7 +87,7 @@
diff -u -p -r1.3 wizard.cxx
--- openoffice.org.orig/desktop/source/migration/wizard.cxx 11 Mar 2005 10:50:09 -0000 1.3
+++ openoffice.org/desktop/source/migration/wizard.cxx 29 Mar 2005 09:01:44 -0000
-@@ -711,25 +711,8 @@
+@@ -729,25 +729,8 @@
// yuck! no license :/
}
@@ -97,8 +97,8 @@
- OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
- AllSettings aSettings(Application::GetSettings());
- aLocale = aSettings.GetUILocale();
-- ResMgr::SearchCreateResMgr(aMgrName, aLocale);
-+ OUString aLangString(OUString::createFromAscii("en-US"));
+- ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
++ OUString aLangString(OUString::createFromAscii("en-US"));
- aLangString = aLocale.Language;
- if ( aLocale.Country.getLength() != 0 )
@@ -114,6 +114,14 @@
#ifdef WNT
aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+@@ -763,7 +746,6 @@
+ + aLangString
+ + OUString::createFromAscii(szUNXLicenseExt);
+ #endif
+- delete pLocalResMgr;
+ return aLicensePath;
+ }
+ }
Index: util/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/util/makefile.mk,v
openoffice.org-1.9.97.rh156067.noversionedsysui.patch:
Index: openoffice.org-1.9.97.rh156067.noversionedsysui.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.97.rh156067.noversionedsysui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.97.rh156067.noversionedsysui.patch 19 May 2007 16:10:07 -0000 1.1
+++ openoffice.org-1.9.97.rh156067.noversionedsysui.patch 16 Aug 2007 07:04:22 -0000 1.2
@@ -21,16 +21,18 @@
diff -u -p -r1.3 makefile.mk
--- openoffice.org.orig/sysui/desktop/share/makefile.mk 21 Jan 2005 11:19:32 -0000 1.3
+++ openoffice.org/sysui/desktop/share/makefile.mk 27 Apr 2005 10:11:04 -0000
-@@ -144,9 +144,9 @@
+@@ -145,10 +145,10 @@
@$(MKDIRHIER) $(@:db).$(INPATH)
@echo Creating desktop entries for $(@:f) ..
@echo ---------------------------------
-- @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u '$${{UNIXPRODUCTNAME}}$${{PRODUCTVERSION}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH)
+- @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH)
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
-+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}}' -u '$${{UNIXPRODUCTNAME}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH)
+- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_comment.ulf
++ @$(PERL) brand.pl -p '$${{PRODUCTNAME}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH)
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
++ @$(PERL) translate.pl -p '$${{PRODUCTNAME}}}' -d $(@:db).$(INPATH) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_comment.ulf
+
.IF "$(WITH_LIBSN)"=="YES"
- @$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))
- .ENDIF
+ @noop x$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x
openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch:
Index: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 29 Nov 2005 09:35:11 -0000 1.1
+++ openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 16 Aug 2007 07:04:22 -0000 1.2
@@ -5,23 +5,24 @@
diff -u -p -u -r1.57 docnew.cxx
--- openoffice.org.orig/sw/source/core/doc/docnew.cxx 8 Nov 2005 17:16:18 -0000 1.57
+++ openoffice.org/sw/source/core/doc/docnew.cxx 29 Nov 2005 09:38:58 -0000
-@@ -500,6 +500,15 @@ SwDoc::SwDoc() :
+@@ -502,6 +502,16 @@
SwDoc::~SwDoc()
{
-+ if( pExtInputRing )
-+ {
-+ Ring* pTmp = pExtInputRing;
-+ pExtInputRing = 0;
-+ while( pTmp->GetNext() != pTmp )
-+ delete pTmp->GetNext();
-+ delete pTmp;
-+ }
++ if( pExtInputRing )
++ {
++ Ring* pTmp = pExtInputRing;
++ pExtInputRing = 0;
++ while( pTmp->GetNext() != pTmp )
++ delete pTmp->GetNext();
++ delete pTmp;
++ }
+
- //!! needs to be done to destroy a possible SwFmtDrop format that may
- //!! be connected to a char format which may not otherwise be removed
- //!! and thus would leave a unremoved SwFmt object. (TL)
-@@ -569,15 +578,6 @@ SwDoc::~SwDoc()
++
+ // --> OD 2007-03-16 #i73788#
+ SwPauseThreadStarting aPauseThreadStarting;
+ // <--
+@@ -582,15 +592,6 @@
pBookmarkTbl->DeleteAndDestroy( 0, pBookmarkTbl->Count() );
DELETEZ( pMacroTable );
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 14 Aug 2007 09:45:18 -0000 1.15
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 16 Aug 2007 07:04:22 -0000 1.16
@@ -1,6 +1,6 @@
diff -ru vcl/inc/impfont.hxx vcl/inc/impfont.hxx
---- openoffice.org.orig/vcl/inc/impfont.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/impfont.hxx 2006-05-05 09:39:11.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/impfont.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/impfont.hxx 2006-05-05 09:39:11.000000000 +0100
@@ -155,6 +155,42 @@
bool operator==( const ImplFontMetric& ) const;
};
@@ -45,9 +45,9 @@
// - ImplFontCharMap -
// -------------------
diff -ru vcl/inc/outdev.hxx vcl/inc/outdev.hxx
---- openoffice.org.orig/vcl/inc/outdev.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/outdev.hxx 2006-05-05 10:27:05.000000000 +0100
-@@ -105,6 +105,8 @@
+--- openoffice.org.orig/vcl/inc/vcl/outdev.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/outdev.hxx 2006-05-05 10:27:05.000000000 +0100
+@@ -106,6 +106,8 @@
class FontCharMap;
class SalLayout;
class ImplLayoutArgs;
@@ -56,17 +56,17 @@
class VirtualDevice;
namespace basegfx {
-@@ -543,6 +545,7 @@
+@@ -566,6 +568,7 @@
SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont );
SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& );
+ SAL_DLLPRIVATE void ImplGetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
- #endif
+ //#endif
protected:
diff -ru vcl/inc/outfont.hxx vcl/inc/outfont.hxx
---- openoffice.org.orig/vcl/inc/outfont.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/outfont.hxx 2006-05-04 14:37:46.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/outfont.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/outfont.hxx 2006-05-04 14:37:46.000000000 +0100
@@ -118,8 +118,6 @@
bool IsDeviceFont() const { return mbDevice; }
bool IsEmbeddable() const { return mbEmbeddable; }
@@ -86,8 +86,8 @@
// ----------------
diff -ru vcl/inc/salgdi.hxx vcl/inc/salgdi.hxx
---- openoffice.org.orig/vcl/inc/salgdi.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/salgdi.hxx 2006-05-05 10:40:08.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/salgdi.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/salgdi.hxx 2006-05-05 10:40:08.000000000 +0100
@@ -215,6 +215,8 @@
void ReleaseFonts() { SetFont( NULL, 0 ); }
// get the current font's metrics
@@ -98,8 +98,8 @@
// return only PairCount if (pKernPairs == NULL)
virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ) = 0;
diff -ru vcl/inc/vclenum.hxx vcl/inc/vclenum.hxx
---- openoffice.org.orig/vcl/inc/vclenum.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/vclenum.hxx 2006-05-04 15:53:15.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/vclenum.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/vclenum.hxx 2006-05-04 15:53:15.000000000 +0100
@@ -289,6 +289,27 @@
#endif
@@ -741,7 +741,7 @@
diff -ru psprint/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:10.000000000 -0400
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:32.000000000 -0400
-@@ -379,9 +379,7 @@
+@@ -391,9 +391,7 @@
m_nXMax( 0 ),
m_nYMax( 0 ),
m_bHaveVerticalSubstitutedGlyphs( false ),
@@ -752,7 +752,7 @@
{
}
-@@ -2594,8 +2592,6 @@
+@@ -2761,8 +2759,6 @@
rInfo.m_eWeight = pFont->m_eWeight;
rInfo.m_ePitch = pFont->m_ePitch;
rInfo.m_aEncoding = pFont->m_aEncoding;
@@ -761,9 +761,18 @@
rInfo.m_aAliases.clear();
for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
+@@ -4006,8 +4002,6 @@
+ BuiltinFont* pFont = new BuiltinFont();
+ pFont->m_nDirectory = 0;
+ pFont->m_bUserOverride = false;
+- pFont->m_eEmbeddedbitmap = fcstatus::isunset;
+- pFont->m_eAntialias = fcstatus::isunset;
+ pFont->m_pMetrics = new PrintFontMetrics;
+ memset( pFont->m_pMetrics->m_aPages, 0xff, sizeof( pFont->m_pMetrics->m_aPages ) );
+ pFont->m_pMetrics->m_bKernPairsQueried = true;
diff -ru vcl/inc/impfont.hxx vcl/inc/impfont.hxx
---- openoffice.org.orig/vcl/inc/impfont.hxx 2006-05-22 13:59:55.000000000 +0100
-+++ openoffice.org/vcl/inc/impfont.hxx 2006-05-23 12:26:20.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/impfont.hxx 2006-05-22 13:59:55.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/impfont.hxx 2006-05-23 12:26:20.000000000 +0100
@@ -167,24 +167,29 @@
FontAutoHint meAutoHint; // whether the font should be autohinted
FontHinting meHinting; // whether the font should be hinted
@@ -798,8 +807,8 @@
bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; }
bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
diff -ru vcl/inc/vclenum.hxx vcl/inc/vclenum.hxx
---- openoffice.org.orig/vcl/inc/vclenum.hxx 2006-05-22 13:59:55.000000000 +0100
-+++ openoffice.org/vcl/inc/vclenum.hxx 2006-05-22 14:14:49.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/vclenum.hxx 2006-05-22 13:59:55.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/vclenum.hxx 2006-05-22 14:14:49.000000000 +0100
@@ -310,6 +310,14 @@
#endif
@@ -823,14 +832,14 @@
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 24 Jan 2007 15:08:39 -0000 1.139.12.2
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 13 Apr 2007 11:33:47 -0000
@@ -44,6 +44,7 @@
- #include <impfont.hxx>
- #include <bitmap.hxx>
- #include <bmpacc.hxx>
-+#include <virdev.hxx>
+ #include <vcl/impfont.hxx>
+ #include <vcl/bitmap.hxx>
+ #include <vcl/bmpacc.hxx>
++#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -614,9 +617,6 @@
+@@ -616,9 +617,6 @@
aDFA.mbSubsettable= false;
aDFA.mbEmbeddable = false;
@@ -840,7 +849,7 @@
FT_Done_Face( aFaceFT );
AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
++nCount;
-@@ -696,6 +696,7 @@
+@@ -698,6 +696,7 @@
: ServerFont( rFSD ),
mnPrioEmbedded(nDefaultPrioEmbedded),
mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -848,7 +857,7 @@
mpFontInfo( pFI ),
maFaceFT( NULL ),
maSizeFT( NULL ),
-@@ -825,42 +826,84 @@
+@@ -830,42 +829,84 @@
mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
@@ -956,7 +965,7 @@
#endif
if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1192,13 +1239,15 @@
+@@ -1197,13 +1238,15 @@
}
}
@@ -973,7 +982,7 @@
#endif
if( nGlyphIndex != 0 )
-@@ -1329,11 +1378,11 @@
+@@ -1334,11 +1377,11 @@
#if (FTVERSION >= 2002)
// for 0/90/180/270 degree fonts enable autohinting even if not advisable
// non-hinted and non-antialiased bitmaps just look too ugly
@@ -987,7 +996,7 @@
nLoadFlags |= FT_LOAD_NO_BITMAP;
FT_Error rc = -1;
-@@ -1484,7 +1533,7 @@
+@@ -1489,7 +1532,7 @@
// autohinting in FT<=2.0.4 makes antialiased glyphs look worse
nLoadFlags |= FT_LOAD_NO_HINTING;
#else
@@ -1180,3 +1189,97 @@
+
.INCLUDE : target.mk
+Index: svppspgraphics.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svppspgraphics.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 svppspgraphics.cxx
+--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.cxx 24 Jul 2007 10:28:29 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svppspgraphics.cxx 15 Aug 2007 11:59:04 -0000
+@@ -1175,32 +1175,6 @@
+ aDFA.mePitch = ToFontPitch (rInfo.m_ePitch);
+ aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
+
+- switch (rInfo.m_eEmbeddedbitmap)
+- {
+- default:
+- aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+- break;
+- case psp::fcstatus::istrue:
+- aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_TRUE;
+- break;
+- case psp::fcstatus::isfalse:
+- aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_FALSE;
+- break;
+- }
+-
+- switch (rInfo.m_eAntialias)
+- {
+- default:
+- aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+- break;
+- case psp::fcstatus::istrue:
+- aDFA.meAntiAlias = ANTIALIAS_TRUE;
+- break;
+- case psp::fcstatus::isfalse:
+- aDFA.meAntiAlias = ANTIALIAS_FALSE;
+- break;
+- }
+-
+ // special case for the ghostscript fonts
+ if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
+ aDFA.maName = aDFA.maName.Copy( 4 );
+@@ -1386,3 +1360,7 @@
+ return bRet && m_bSwallowFaxNo;
+ }
+
++void PspGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
++{
++}
++
+Index: svppspgraphics.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svppspgraphics.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 svppspgraphics.hxx
+--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.hxx 24 Jul 2007 10:28:40 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svppspgraphics.hxx 15 Aug 2007 12:02:57 -0000
+@@ -201,6 +201,7 @@
+
+ virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+ virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
++ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+ };
+
+ #endif // _SVP_PSPGRAPHICS_HXX
+Index: svpgdi.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svpgdi.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 svpgdi.cxx
+--- openoffice.org.orig/vcl/unx/headless/svpgdi.cxx 24 Jul 2007 10:27:28 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svpgdi.cxx 15 Aug 2007 12:06:47 -0000
+@@ -535,3 +535,7 @@
+ {
+ return FALSE;
+ }
++
++void SvpSalGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
++{
++}
+Index: svpgdi.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svpgdi.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 svpgdi.hxx
+--- openoffice.org.orig/vcl/unx/headless/svpgdi.hxx 24 Jul 2007 10:27:38 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svpgdi.hxx 15 Aug 2007 12:07:36 -0000
+@@ -176,6 +176,8 @@
+ virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+
+ virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
++
++ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+ };
+
+ #endif
openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch:
Index: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch 24 Apr 2006 12:24:18 -0000 1.1
+++ openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch 16 Aug 2007 07:04:22 -0000 1.2
@@ -1,6 +1,6 @@
--- openoffice.org.orig/extras/source/palettes/standard.soc 2004-09-14 11:15:39.147812605 -0400
+++ openoffice.org/extras/source/palettes/standard.soc 2004-09-14 11:20:51.940313307 -0400
-@@ -88,8 +88,9 @@
+@@ -88,10 +88,11 @@
<draw:color draw:name="Dark violet" draw:color="#660066"/>
<draw:color draw:name="Salmon" draw:color="#ff8080"/>
<draw:color draw:name="Sea blue" draw:color="#0066cc"/>
@@ -8,11 +8,18 @@
- <draw:color draw:name="Sun 2" draw:color="#666699"/>
- <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
- <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
--</office:color-table>
-\ No newline at end of file
+ <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
+ <draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
+ <draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
+ <draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
+ <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>
+ <draw:color draw:name="Chart 1" draw:color="#004586"/>
+ <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
+ <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
+@@ -104,4 +105,4 @@
+ <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
+ <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
+ <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
+-</office:color-table>
+\ No newline at end of file
+</office:color-table>
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 5 Jun 2007 13:01:23 -0000 1.14
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 16 Aug 2007 07:04:22 -0000 1.15
@@ -531,16 +531,16 @@
bridges::cpp_uno::shared::isSimpleType(
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:55:15.000000000 +0100
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:56:12.000000000 +0100
-@@ -674,7 +674,7 @@
+@@ -666,7 +666,7 @@
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-- void ** slots, unsigned char * code,
+- void ** slots, unsigned char * code,
+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
sal_Int32 functionCount, sal_Int32 vtableOffset)
{
-@@ -690,7 +690,7 @@
+@@ -682,7 +682,7 @@
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
// Getter:
@@ -549,7 +549,7 @@
code = codeSnippet(
code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
-@@ -703,13 +703,13 @@
+@@ -695,13 +695,13 @@
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
{
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 18 May 2007 13:35:44 -0000 1.32
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 16 Aug 2007 07:04:22 -0000 1.33
@@ -160,11 +160,11 @@
RCS file: /cvs/gsl/vcl/inc/jobset.hxx,v
retrieving revision 1.7
diff -u -r1.7 jobset.hxx
---- openoffice.org.orig/vcl/inc/jobset.hxx 9 Sep 2005 11:06:48 -0000 1.7
-+++ openoffice.org/vcl/inc/jobset.hxx 19 May 2006 13:16:52 -0000
+--- openoffice.org.orig/vcl/inc/vcl/jobset.hxx 9 Sep 2005 11:06:48 -0000 1.7
++++ openoffice.org/vcl/inc/vcl/jobset.hxx 19 May 2006 13:16:52 -0000
@@ -50,6 +50,7 @@
#ifndef _SV_PRNTYPES_HXX
- #include <prntypes.hxx>
+ #include <vcl/prntypes.hxx>
#endif
+#include <psprint/printerinfomanager.hxx>
@@ -174,18 +174,18 @@
*/
String GetValue( const String& rKey ) const;
void SetValue( const String& rKey, const String& rValue );
-+ void SetCupsKey( const String& rKey, const String& rValue );
-+ psp::PrinterInfo GetPrinterInfo() const;
-
++ void SetCupsKey( const String& rKey, const String& rValue );
++ psp::PrinterInfo GetPrinterInfo() const;
JobSetup& operator=( const JobSetup& rJob );
+
Index: inc/print.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/print.hxx,v
retrieving revision 1.22
diff -u -r1.22 print.hxx
---- openoffice.org.orig/vcl/inc/print.hxx 9 Sep 2005 11:15:40 -0000 1.22
-+++ openoffice.org/vcl/inc/print.hxx 19 May 2006 13:16:55 -0000
+--- openoffice.org.orig/vcl/inc/vcl/print.hxx 9 Sep 2005 11:15:40 -0000 1.22
++++ openoffice.org/vcl/inc/vcl/print.hxx 19 May 2006 13:16:55 -0000
@@ -355,6 +355,9 @@
const JobSetup& GetJobSetup() const { return maJobSetup; }
String GetJobValue( const String& rKey ) const { return maJobSetup.GetValue( rKey ); }
@@ -520,8 +520,8 @@
RCS file: /cvs/util/svtools/inc/printdlg.hxx,v
retrieving revision 1.9
diff -u -r1.9 printdlg.hxx
---- openoffice.org.orig/svtools/inc/printdlg.hxx 8 Sep 2005 10:06:06 -0000 1.9
-+++ openoffice.org/svtools/inc/printdlg.hxx 16 Nov 2006 14:14:18 -0000
+--- openoffice.org.orig/svtools/inc/svtools/printdlg.hxx 8 Sep 2005 10:06:06 -0000 1.9
++++ openoffice.org/svtools/inc/svtools/printdlg.hxx 16 Nov 2006 14:14:18 -0000
@@ -140,6 +140,9 @@
Link maOKHdlLink; // Link zum OK-Handler
@@ -548,10 +548,10 @@
diff -u -r1.23 printdlg.cxx
--- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx 17 Sep 2006 14:45:21 -0000 1.23
+++ openoffice.org/svtools/source/dialogs/printdlg.cxx 16 Nov 2006 14:14:35 -0000
-@@ -85,9 +85,62 @@
+@@ -84,9 +84,64 @@
+ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
-
+extern void ImplDeletePrnQueueList();
+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
+#include <com/sun/star/frame/XFrame.hpp>
@@ -583,7 +583,7 @@
+#include <unotools/ucbstreamhelper.hxx>
+
+#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
-+#include "miscopt.hxx"
++#include "svtools/miscopt.hxx"
+#endif
+#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkstock.h>
@@ -598,20 +598,22 @@
+
+using namespace osl;
+
- using namespace com::sun::star::uno;
- using namespace com::sun::star::lang;
+
+ using rtl::OUString;
+ using namespace com::sun::star;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
- using namespace com::sun::star::ui::dialogs;
+using namespace com::sun::star::view;
+using namespace com::sun::star::document;
+using namespace com::sun::star::sheet;
+using namespace com::sun::star::container;
+using namespace com::sun::star::io;
- using namespace rtl;
++using namespace com::sun::star::uno;
++using namespace com::sun::star::lang;
struct SvtPrinterImpl
-@@ -139,7 +185,10 @@
+ {
+@@ -137,7 +190,10 @@
maBtnHelp ( this, SvtResId( BTN_HELP ) ),
maFlSepCopiesRange( this, SvtResId( FL_SEPCOPIESRANGE ) ),
maFlSepButtonLine( this, SvtResId( FL_SEPBUTTONLINE ) ),
@@ -623,7 +625,7 @@
{
FreeResource();
-@@ -608,6 +656,250 @@
+@@ -605,6 +661,250 @@
// -----------------------------------------------------------------------
@@ -874,7 +876,7 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,309 @@
+@@ -622,15 +922,309 @@
ImplInitControls();
ImplModifyControlHdl( NULL );
@@ -897,7 +899,7 @@
+ {
+ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent);
+
-+ rtl::OString aOptions(OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
++ rtl::OString aOptions(rtl::OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
+ aOptions = aOptions.replace('~','_');
+
+ gtk_dialog_add_button( GTK_DIALOG( aHandle.pDialog ), aOptions.getStr(), GTK_RESPONSE_HELP);
@@ -1191,7 +1193,7 @@
}
maStatusTimer.Stop();
-@@ -648,4 +1161,3 @@
+@@ -645,4 +1239,3 @@
mpPrinterImpl->m_bHelpDisabled = sal_True;
maBtnHelp.Disable();
}
@@ -1241,8 +1243,8 @@
diff -u -r1.45 printdlg.src
--- openoffice.org/svtools/source/dialogs/printdlg.src 23 Sep 2005 14:52:41 -0000 1.45
+++ openoffice.org.orig/svtools/source/dialogs/printdlg.src 16 Nov 2006 14:14:44 -0000
-@@ -291,6 +291,16 @@
- Text [ de ] = "<Alle>";
+@@ -256,6 +256,16 @@
+ {
Text [ en-US ] = "<All>";
};
+ String STR_PAPER_PAPER_TXT
@@ -1255,9 +1257,9 @@
+ Text [ de ] = "Orientierung:";
+ Text [ en-US ] = "Orientation:";
+ };
- Text [ x-comment ] = " ";
};
+ Image RID_IMG_PRNDLG_COLLATE
--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 10:03:20.000000000 +0000
+++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-29 12:49:51.000000000 +0000
@@ -137,6 +137,14 @@
@@ -1280,8 +1282,8 @@
RCS file: /cvs/gsl/vcl/inc/print.h,v
retrieving revision 1.3
diff -u -r1.3 print.h
---- openoffice.org.orig/vcl/inc/print.h 9 Sep 2005 11:15:23 -0000 1.3
-+++ openoffice.org/vcl/inc/print.h 15 Mar 2007 12:07:29 -0000
+--- openoffice.org.orig/vcl/inc/vcl/print.h 9 Sep 2005 11:15:23 -0000 1.3
++++ openoffice.org/vcl/inc/vcl/print.h 15 Mar 2007 12:07:29 -0000
@@ -82,6 +82,6 @@
// - Prototypes -
// --------------
@@ -1305,8 +1307,8 @@
RCS file: /cvs/gsl/vcl/inc/Attic/salframe.hxx,v
retrieving revision 1.30
diff -u -r1.30 salframe.hxx
---- openoffice.org.orig/vcl/inc/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30
-+++ openoffice.org/vcl/inc/salframe.hxx 1 May 2007 12:21:25 -0000
+--- openoffice.org.orig/vcl/inc/vcl/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30
++++ openoffice.org/vcl/inc/vcl/salframe.hxx 1 May 2007 12:21:25 -0000
@@ -313,6 +313,9 @@
// (e.g. input methods, printer update handlers).
long CallCallback( USHORT nEvent, const void* pEvent ) const
@@ -1322,8 +1324,8 @@
RCS file: /cvs/gsl/vcl/inc/Attic/window.hxx,v
retrieving revision 1.80.24.1
diff -u -r1.80.24.1 window.hxx
---- openoffice.org.orig/vcl/inc/window.hxx 19 Jan 2007 16:10:11 -0000 1.80.24.1
-+++ openoffice.org/vcl/inc/window.hxx 1 May 2007 12:21:29 -0000
+--- openoffice.org.orig/vcl/inc/vcl/window.hxx 19 Jan 2007 16:10:11 -0000 1.80.24.1
++++ openoffice.org/vcl/inc/vcl/window.hxx 1 May 2007 12:21:29 -0000
@@ -1087,6 +1087,9 @@
/* mark Window for deletion in top of event queue
*/
openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch:
Index: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch 24 Sep 2006 16:16:45 -0000 1.1
+++ openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch 16 Aug 2007 07:04:22 -0000 1.2
@@ -20,16 +20,16 @@
diff -u -r1.9 spadmin.xhp
--- openoffice.org.orig/helpcontent2/source/text/shared/guide/spadmin.xhp 28 Jun 2006 15:43:29 -0000 1.9
+++ openoffice.org/helpcontent2/source/text/shared/guide/spadmin.xhp 24 Sep 2006 14:46:08 -0000
-@@ -81,8 +81,6 @@
+@@ -58,8 +58,6 @@
<bookmark_value>PostScript; PDF converter, UNIX</bookmark_value>
<bookmark_value>converters; PostScript, UNIX</bookmark_value>
<bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
-<bookmark_value>fonts; adding under UNIX</bookmark_value>
-<bookmark_value>typefaces; adding under UNIX</bookmark_value>
- </bookmark>
+ </bookmark><comment>mw deleted "printer programs under UNIX", "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
<paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
-@@ -100,7 +98,6 @@
+@@ -77,7 +75,6 @@
</list>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph>
<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph>
@@ -37,7 +37,7 @@
<paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph>
<paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph>
-@@ -257,88 +254,6 @@
+@@ -234,88 +231,6 @@
</list>
<paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
<paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch:
Index: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 6 Jun 2007 15:25:17 -0000 1.1
+++ openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 16 Aug 2007 07:04:22 -0000 1.2
@@ -121,170 +121,3 @@
aSuppLocales.realloc(numlocs);
-Index: configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.192.2.3
-diff -u -r1.192.2.3 configure.in
---- openoffice.org.orig/config_office/configure.in 19 Jan 2007 12:55:19 -0000 1.192.2.3
-+++ openoffice.org/config_office/configure.in 6 Jun 2007 14:11:02 -0000
-@@ -3985,14 +3985,16 @@
- AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
- [AC_MSG_ERROR(hunspell headers not found.)], [])
- ], [])
-- AC_CHECK_LIB(hunspell, main, [],
-+ AC_CHECK_LIB(hunspell-1.1, main, [],
- [ AC_MSG_ERROR(hunspell library not found.) ], [])
-+ HUNSPELL_LIBS="-lhunspell-1.1"
- else
- AC_MSG_RESULT([internal])
- SYSTEM_HUNSPELL=NO
- fi
- AC_SUBST(SYSTEM_HUNSPELL)
- AC_SUBST(HUNSPELL_CFLAGS)
-+AC_SUBST(HUNSPELL_LIBS)
-
- dnl ===================================================================
- dnl Checking for altlinuxhyph
-Index: set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.130.2.3
-diff -u -r1.130.2.3 set_soenv.in
---- openoffice.org.orig/config_office/set_soenv.in 19 Jan 2007 12:55:33 -0000 1.130.2.3
-+++ openoffice.org/config_office/set_soenv.in 6 Jun 2007 14:11:03 -0000
-@@ -1852,6 +1852,7 @@
- ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
- ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
- ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
-+ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
- ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
- ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
- ToFile( "PAM", "@PAM@", "e" );
-Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
-retrieving revision 1.11.34.1
-diff -u -r1.11.34.1 makefile.mk
---- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 1 Feb 2007 19:08:18 -0000 1.11.34.1
-+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 6 Jun 2007 14:12:05 -0000
-@@ -97,10 +97,10 @@
- $(LNGLIB) \
- $(HNJLIB)
-
--.IF "$(SYSTEM_MYSPELL)" != "YES"
-+.IF "$(SYSTEM_HUNSPELL)" != "YES"
- SHL1STDLIBS+= $(ULINGULIB)
- .ELSE
--SHL1STDLIBS+= $(MYSPELL_LIBS)
-+SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
-
-
-Index: source/lingutil/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v
-retrieving revision 1.6
-diff -u -r1.6 makefile.mk
---- openoffice.org.orig/lingucomponent/source/lingutil/makefile.mk 7 Sep 2005 19:40:54 -0000 1.6
-+++ openoffice.org/lingucomponent/source/lingutil/makefile.mk 6 Jun 2007 14:12:05 -0000
-@@ -43,9 +43,9 @@
-
- .INCLUDE : settings.mk
-
--.IF "$(SYSTEM_MYSPELL)" == "YES"
-+.IF "$(SYSTEM_HUNSPELL)" == "YES"
- @all:
-- @echo "Nothing to do here; using system myspell..."
-+ @echo "Nothing to do here; using system hunspell..."
- .ENDIF
-
- SLOFILES= \
-Index: source/spellcheck/spell/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v
-retrieving revision 1.13.34.1
-diff -u -r1.13.34.1 makefile.mk
---- openoffice.org.orig/lingucomponent/source/spellcheck/spell/makefile.mk 1 Feb 2007 19:08:29 -0000 1.13.34.1
-+++ openoffice.org/lingucomponent/source/spellcheck/spell/makefile.mk 6 Jun 2007 14:12:06 -0000
-@@ -40,11 +40,6 @@
- ENABLE_EXCEPTIONS=TRUE
- USE_DEFFILE=TRUE
-
--.IF "$(MYSPELLLIB)"==""
--.ELSE
-- at echo "Build Hunspell instead of system Myspell."
--.ENDIF
--
- .IF "$(HUNSPELLLIB)"==""
- .IF "$(GUI)"=="UNX"
- HUNSPELLLIB=-lhunspell
-@@ -108,11 +103,12 @@
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
-- $(LNGLIB) \
-- $(HUNSPELLLIB)
-+ $(LNGLIB)
-
- .IF "$(SYSTEM_HUNSPELL)" != "YES"
--SHL1STDLIBS+= $(ULINGULIB)
-+SHL1STDLIBS+= $(ULINGULIB) $(HUNSPELLLIB)
-+.ELSE
-+SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
-
- # build DLL
-Index: source/thesaurus/libnth/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/makefile.mk,v
-retrieving revision 1.7.34.1
-diff -u -r1.7.34.1 makefile.mk
---- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/makefile.mk 1 Feb 2007 19:08:41 -0000 1.7.34.1
-+++ openoffice.org/lingucomponent/source/thesaurus/libnth/makefile.mk 6 Jun 2007 14:12:06 -0000
-@@ -66,22 +66,22 @@
-
- # --- Files --------------------------------------------------------
-
--.IF "$(SYSTEM_MYSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
--CXXFLAGS += $(MYSPELL_CFLAGS)
--CFLAGSCXX += $(MYSPELL_CFLAGS)
--CFLAGSCC += $(MYSPELL_CFLAGS)
--.ENDIF
--.IF "$(SYSTEM_MYSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
--CXXFLAGS += -I..$/mythes $(MYSPELL_CFLAGS)
--CFLAGSCXX += -I..$/mythes $(MYSPELL_CFLAGS)
--CFLAGSCC += -I..$/mythes $(MYSPELL_CFLAGS)
-+.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
-+CXXFLAGS += $(HUNSPELL_CFLAGS)
-+CFLAGSCXX += $(HUNSPELL_CFLAGS)
-+CFLAGSCC += $(HUNSPELL_CFLAGS)
-+.ENDIF
-+.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
-+CXXFLAGS += -I..$/mythes $(HUNSPELL_CFLAGS)
-+CFLAGSCXX += -I..$/mythes $(HUNSPELL_CFLAGS)
-+CFLAGSCC += -I..$/mythes $(HUNSPELL_CFLAGS)
- .ENDIF
- .IF "$(SYSTEM_MYPSPELL)" != "YES" && "$(SYSTEM_MYTHES)" == "YES"
- CXXFLAGS += -I..$/..$/lingutil
- CFLAGSCXX += -I..$/..$/lingutil
- CFLAGSCC += -I..$/..$/lingutil
- .ENDIF
--.IF "$(SYSTEM_MYSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
-+.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
- CXXFLAGS += -I..$/mythes -I..$/..$/lingutil
- CFLAGSCXX += -I..$/mythes -I..$/..$/lingutil
- CFLAGSCC += -I..$/mythes -I..$/..$/lingutil
-@@ -117,10 +117,10 @@
- $(LNGLIB) \
- $(MYTHESLIB)
-
--.IF "$(SYSTEM_MYSPELL)" != "YES"
-+.IF "$(SYSTEM_HUNSPELL)" != "YES"
- SHL1STDLIBS+= $(ULINGULIB)
- .ELSE
--SHL1STDLIBS+= $(MYSPELL_LIBS)
-+SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
- # build DLL
- SHL1LIBS= $(SLB)$/$(TARGET).lib
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 1 Aug 2007 11:00:56 -0000 1.3
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 16 Aug 2007 07:04:22 -0000 1.4
@@ -1,1252 +1,1550 @@
---- /dev/null 2006-08-13 17:52:05.000000000 +0200
-+++ Source/avmedia/source/gstreamer/exports.dxp 2006-08-22 11:38:56.000000000 +0200
-@@ -0,0 +1,4 @@
-+component_getImplementationEnvironment
-+component_writeInfo
-+component_getFactory
-+
---- /dev/null 2006-08-13 17:52:05.000000000 +0200
-+++ Source/avmedia/source/gstreamer/gstcommon.hxx 2006-08-22 11:38:56.000000000 +0200
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * last change: $Author$ $Date$
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef _GSTCOMMON_HXX
-+#define _GSTCOMMON_HXX
-+
-+#include <gst/gst.h>
+diff -rup avmedia-orig/prj/build.lst avmedia/prj/build.lst
+--- avmedia-orig/prj/build.lst 2006-08-17 16:04:56.000000000 +0200
++++ avmedia/prj/build.lst 2006-08-17 16:05:01.000000000 +0200
+@@ -7,4 +7,5 @@ av avmedia\source\framework nmake - all
+ av avmedia\source\win nmake - all av_win NULL
+ av avmedia\source\java nmake - all av_java NULL
+ av avmedia\source\xine nmake - all av_xine NULL
+-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_xine NULL
++av avmedia\source\gstreamer nmake - all av_gstreamer NULL
++av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_xine av_gstreamer NULL
+diff -rup avmedia-orig/source/inc/mediamisc.hxx avmedia/source/inc/mediamisc.hxx
+--- avmedia-orig/source/inc/mediamisc.hxx 2006-08-17 16:04:56.000000000 +0200
++++ avmedia/source/inc/mediamisc.hxx 2006-08-17 16:06:41.000000000 +0200
+@@ -37,13 +37,16 @@ class ResMgr;
+
+ #define AVMEDIA_RESID( nId ) ResId( nId, ::avmedia::GetResMgr() )
+
++#ifdef GSTREAMER
++#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
++#else
+ #ifdef WNT
+ #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ #else
+ #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+ #endif
++#endif
+
+-
+ namespace avmedia
+ {
+ ResMgr* GetResMgr();
+Index: mediawindow_impl.cxx
+===================================================================
+RCS file: /cvs/graphics/avmedia/source/viewer/mediawindow_impl.cxx,v
+retrieving revision 1.7
+diff -u -u -r1.7 mediawindow_impl.cxx
+--- avmedia/source/viewer/mediawindow_impl.cxx 19 Jun 2006 13:59:09 -0000 1.7
++++ avmedia/source/viewer/mediawindow_impl.cxx 24 Aug 2006 14:17:41 -0000
+@@ -44,6 +44,11 @@
+ #include <osl/mutex.hxx>
+ #include <tools/time.hxx>
+ #include <vcl/svapp.hxx>
++#ifdef UNX
++#ifndef _SV_SYSDATA_HXX
++#include <vcl/sysdata.hxx>
++#endif
++#endif
+
+ #ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
+ #include <com/sun/star/awt/SystemPointer.hdl>
+@@ -102,7 +107,11 @@
+ // --------------------
+
+ MediaChildWindow::MediaChildWindow( Window* pParent ) :
++#ifdef GSTREAMER
++ SystemChildWindow( pParent, WB_CLIPCHILDREN )
++#else
+ JavaChildWindow( pParent, WB_CLIPCHILDREN )
++#endif
+ {
+ }
+
+@@ -119,7 +128,11 @@
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
++#ifdef GSTREAMER
++ SystemChildWindow::MouseMove( rMEvt );
++#else
+ JavaChildWindow::MouseMove( rMEvt );
++#endif
+ GetParent()->MouseMove( aTransformedEvent );
+ }
+
+@@ -130,7 +143,11 @@
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
++#ifdef GSTREAMER
++ SystemChildWindow::MouseButtonDown( rMEvt );
++#else
+ JavaChildWindow::MouseButtonDown( rMEvt );
++#endif
+ GetParent()->MouseButtonDown( aTransformedEvent );
+ }
+
+@@ -140,8 +157,12 @@
+ {
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+-
+
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
++#ifdef GSTREAMER
++ SystemChildWindow::MouseButtonUp( rMEvt );
++#else
+ JavaChildWindow::MouseButtonUp( rMEvt );
+#endif
-+#ifndef _DEBUG_HXX
-+#include <tools/debug.hxx>
+ GetParent()->MouseButtonUp( aTransformedEvent );
+ }
+
+@@ -149,7 +170,11 @@
+
+ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
+ {
++#ifdef GSTREAMER
++ SystemChildWindow::KeyInput( rKEvt );
++#else
+ JavaChildWindow::KeyInput( rKEvt );
+#endif
-+#ifndef _STREAM_HXX
-+#include <tools/stream.hxx>
+ GetParent()->KeyInput( rKEvt );
+ }
+
+@@ -157,7 +182,11 @@
+
+ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
+ {
++#ifdef GSTREAMER
++ SystemChildWindow::KeyUp( rKEvt );
++#else
+ JavaChildWindow::KeyUp( rKEvt );
+#endif
-+#ifndef _STRING_HXX
-+#include <tools/string.hxx>
+ GetParent()->KeyUp( rKEvt );
+ }
+
+@@ -168,7 +197,11 @@
+ const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
+ rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
+
++#ifdef GSTREAMER
++ SystemChildWindow::Command( rCEvt );
++#else
+ JavaChildWindow::Command( rCEvt );
+#endif
-+#ifndef _URLOBJ_HXX
[...5438 lines suppressed...]
-+ Text [ ka ] = "ááááá á¤áááá" ;
-+ Text [ km ] = "á¯ááá¶áâáá¸ááá¢á¼" ;
-+ Text [ ko ] = "ë¹ëì¤ íì¼" ;
-+ Text [ ku ] = "Pelgeha vîdeo" ;
-+ Text [ lt ] = "Vaizdo failas" ;
-+ Text [ mk ] = "ÐидеодаÑоÑека" ;
-+ Text [ ml-IN ] = "à´µàµà´¡à´¿à´¯àµ ഫയലàµ" ;
-+ Text [ mr-IN ] = "à¤à¤¿à¤¤à¥à¤°à¤®à¥à¤¦à¥à¤°à¤ धारिà¤à¤¾" ;
-+ Text [ nb ] = "Videofil" ;
-+ Text [ ne ] = "à¤à¤¿à¤¡à¤¿à¤¯à¥ फाà¤à¤²" ;
-+ Text [ nl ] = "Videobestand" ;
-+ Text [ nn ] = "Videofil" ;
-+ Text [ nr ] = "Ifayili levidiyo" ;
-+ Text [ ns ] = "Faele ya bidio" ;
-+ Text [ or-IN ] = "à¬à¬¿à¬¡à¬¿à¬ ଫାà¬à¬²" ;
-+ Text [ pa-IN ] = "ਵà©à¨¡à¨¿à¨ ਫਾà¨à¨²" ;
-+ Text [ pl ] = "Plik filmowy" ;
-+ Text [ pt ] = "Ficheiro de vÃdeo" ;
-+ Text [ pt-BR ] = "Arquivo de vÃdeo" ;
-+ Text [ ru ] = "Файл видео" ;
-+ Text [ rw ] = "Video file" ;
-+ Text [ sh-YU ] = "Video datoteka" ;
-+ Text [ sk ] = "Video súbor" ;
-+ Text [ sl ] = "Video-datoteka" ;
-+ Text [ sr-CS ] = "Ðидео даÑоÑека" ;
-+ Text [ ss ] = "Ividiyofayela" ;
-+ Text [ st ] = "Bideo faele" ;
-+ Text [ sv ] = "Video-fil" ;
-+ Text [ sw-TZ ] = "Faili la video" ;
-+ Text [ ta ] = "Video file" ;
-+ Text [ ta-IN ] = "Video file" ;
-+ Text [ te-IN ] = "à°¦à±à°¶à±à°¯ దసà±à°¤à±à°°à°®à±" ;
-+ Text [ tg ] = "Ðидео-даÑÑаÑ" ;
-+ Text [ th ] = "Video file" ;
-+ Text [ ti-ER ] = "áá áªáµá® ááá" ;
-+ Text [ tr ] = "Görüntü dosyası" ;
-+ Text [ ts ] = "Fayili ya Vhidiyo" ;
-+ Text [ uk ] = "Video file" ;
-+ Text [ ur-IN ] = "ÙÚÛÙÙائÙ" ;
-+ Text [ ve ] = "Faela ya vidio" ;
-+ Text [ vi ] = "Táºp tin ảnh Äá»ng" ;
-+ Text [ xh ] = "Ifayili yevidiyo" ;
-+ Text [ zh-CN ] = "å½±è§æ件" ;
-+ Text [ zh-TW ] = "è¦é »æªæ¡" ;
-+ Text [ zu ] = "Ifayela levidiyo" ;
-+ Text [ x-comment ] = " ";
++public:
++
++ Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr,
++ Player& rPlayer );
++ ~Window();
++
++ bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
++ void processGraphEvent();
++ void updatePointer();
++
++ // XPlayerWindow
++ virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XWindow
++ virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XComponent
++ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XServiceInfo
++ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
++
++
++private:
++
++ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
++
++ ::osl::Mutex maMutex;
++ ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
++ ::com::sun::star::media::ZoomLevel meZoomLevel;
++ Player& mrPlayer;
++ int mnPointerType;
++
++ void ImplLayoutVideoWindow();
+};
+
- String STR_SVT_MIMETYPE_VIDEO_VDO
- {
- Text [ de ] = "Video-Datei" ;
++} // namespace gstreamer
++} // namespace avmedia
++
++#endif // _WINDOW_HXX
+--- /dev/null 2006-08-13 17:52:05.000000000 +0200
++++ avmedia/source/gstreamer/makefile.mk 2006-08-22 11:38:56.000000000 +0200
+@@ -0,0 +1,85 @@
++#*************************************************************************
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile$
++#
++# $Revision$
++#
++# last change: $Author$ $Date$
++#
++# The Contents of this file are made available subject to
++# the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++# GNU Lesser General Public License Version 2.1
++# =============================================
++# Copyright 2005 by Sun Microsystems, Inc.
++# 901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License version 2.1, as published by the Free Software Foundation.
++#
++# This library 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 for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++#*************************************************************************
++
++PRJ=..$/..
++PRJNAME=avmedia
++TARGET=avmediagst
++
++# --- Settings ----------------------------------
++
++.INCLUDE : settings.mk
++
++.IF "$(ENABLE_GSTREAMER)" == "TRUE"
++
++.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
++CDEFS+= -DVERBOSE
++.ENDIF
++
++PKGCONFIG_MODULES=gstreamer-0.10, gstreamer-plugins-base-0.10
++.INCLUDE: pkg_config.mk
++PKGCONFIG_LIBS+=-lgstinterfaces-0.10
++
++# --- Files ----------------------------------
++
++.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
++
++.IF "$(GUI)" == "WNT"
++CDEFS+= -DWINNT
++.ENDIF
++
++SLOFILES= \
++ $(SLO)$/gstuno.obj \
++ $(SLO)$/gstmanager.obj \
++ $(SLO)$/gstplayer.obj \
++ $(SLO)$/gstwindow.obj
++
++
++EXCEPTIONSFILES= \
++ $(SLO)$/gstuno.obj \
++
++SHL1TARGET=$(TARGET)
++SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB)
++SHL1IMPLIB=i$(TARGET)
++SHL1LIBS=$(SLB)$/$(TARGET).lib
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++
++DEF1NAME=$(SHL1TARGET)
++DEF1EXPORTFILE=exports.dxp
++
++.ENDIF
++
++.ENDIF
++
++.INCLUDE : target.mk
openoffice.org-2.2.0.rh232389.tango.patch:
Index: openoffice.org-2.2.0.rh232389.tango.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.rh232389.tango.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.2.0.rh232389.tango.patch 30 Mar 2007 14:39:51 -0000 1.4
+++ openoffice.org-2.2.0.rh232389.tango.patch 16 Aug 2007 07:04:22 -0000 1.5
@@ -1,46 +1,43 @@
diff -ru svtools.orig/inc/imgdef.hxx svtools/inc/imgdef.hxx
--- openoffice.org.orig/svtools/inc/imgdef.hxx 2007-03-16 11:34:33.000000000 +0000
+++ openoffice.org/svtools/inc/imgdef.hxx 2007-03-16 11:34:45.000000000 +0000
-@@ -46,9 +46,8 @@
+@@ -46,9 +46,7 @@
enum SfxSymbolsStyle
{
SFX_SYMBOLS_STYLE_AUTO,
- SFX_SYMBOLS_STYLE_DEFAULT,
SFX_SYMBOLS_STYLE_HICONTRAST,
- SFX_SYMBOLS_STYLE_INDUSTRIAL,
-+ SFX_SYMBOLS_STYLE_TANGO,
- SFX_SYMBOLS_STYLE_CRYSTAL
+ SFX_SYMBOLS_STYLE_CRYSTAL,
+ SFX_SYMBOLS_STYLE_TANGO
};
-
diff -ru svtools.orig/source/config/miscopt.cxx svtools/source/config/miscopt.cxx
--- openoffice.org.orig/svtools/source/config/miscopt.cxx 2007-03-16 11:34:32.000000000 +0000
+++ openoffice.org/svtools/source/config/miscopt.cxx 2007-03-16 11:35:13.000000000 +0000
-@@ -281,9 +281,8 @@
+@@ -285,9 +285,7 @@
switch ( nStyle )
{
case STYLE_SYMBOLS_AUTO: return SFX_SYMBOLS_STYLE_AUTO;
- case STYLE_SYMBOLS_DEFAULT: return SFX_SYMBOLS_STYLE_DEFAULT;
case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST;
- case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
-+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL;
+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
}
-
-@@ -295,9 +294,8 @@
+@@ -300,9 +298,7 @@
switch ( nStyle )
{
case SFX_SYMBOLS_STYLE_AUTO: return STYLE_SYMBOLS_AUTO;
- case SFX_SYMBOLS_STYLE_DEFAULT: return STYLE_SYMBOLS_DEFAULT;
case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST;
- case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
-+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL;
+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
}
-
diff -ru vcl.orig/inc/settings.hxx vcl/inc/settings.hxx
---- openoffice.org.orig/vcl/inc/settings.hxx 2007-03-16 11:35:31.000000000 +0000
-+++ openoffice.org/vcl/inc/settings.hxx 2007-03-16 11:36:40.000000000 +0000
-@@ -524,10 +524,9 @@
+--- openoffice.org.orig/vcl/inc/vcl/settings.hxx 2007-03-16 11:35:31.000000000 +0000
++++ openoffice.org/vcl/inc/vcl/settings.hxx 2007-03-16 11:36:40.000000000 +0000
+@@ -524,12 +524,10 @@
#define STYLE_TOOLBAR_ICONSIZE_LARGE ((ULONG)2)
#define STYLE_SYMBOLS_AUTO ((ULONG)0)
@@ -48,27 +45,29 @@
-#define STYLE_SYMBOLS_HICONTRAST ((ULONG)2)
-#define STYLE_SYMBOLS_INDUSTRIAL ((ULONG)3)
-#define STYLE_SYMBOLS_CRYSTAL ((ULONG)4)
-+#define STYLE_SYMBOLS_HICONTRAST ((ULONG)1)
-+#define STYLE_SYMBOLS_TANGO ((ULONG)2)
-+#define STYLE_SYMBOLS_CRYSTAL ((ULONG)3)
+-#define STYLE_SYMBOLS_TANGO ((ULONG)5)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)5)
++#define STYLE_SYMBOLS_HICONTRAST ((ULONG)1)
++#define STYLE_SYMBOLS_CRYSTAL ((ULONG)2)
++#define STYLE_SYMBOLS_TANGO ((ULONG)3)
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)3)
#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
diff -ru vcl.orig/source/app/settings.cxx vcl/source/app/settings.cxx
--- openoffice.org.orig/vcl/source/app/settings.cxx 2007-03-16 11:35:31.000000000 +0000
+++ openoffice.org/vcl/source/app/settings.cxx 2007-03-16 11:37:23.000000000 +0000
-@@ -730,9 +730,8 @@
+@@ -723,9 +723,7 @@
{
switch ( nStyle )
{
- case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString::createFromAscii( "default" );
case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString::createFromAscii( "hicontrast" );
- case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
-+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" );
+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
}
-
-@@ -743,12 +742,10 @@
+@@ -737,12 +736,8 @@
ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const
{
@@ -79,28 +78,18 @@
return STYLE_SYMBOLS_HICONTRAST;
- else if ( rName == ::rtl::OUString::createFromAscii( "industrial" ) )
- return STYLE_SYMBOLS_INDUSTRIAL;
-+ else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
-+ return STYLE_SYMBOLS_TANGO;
else if ( rName == ::rtl::OUString::createFromAscii( "crystal" ) )
return STYLE_SYMBOLS_CRYSTAL;
+ else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
+@@ -788,7 +785,7 @@
+
+ // use a hardcoded desktop-specific fallback if no preferred style has been detected
+ static bool sbFallbackDesktopChecked = false;
+- static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
++ static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_TANGO;
-@@ -764,14 +761,14 @@
- if ( nStyle == STYLE_SYMBOLS_AUTO )
- {
- static bool sbDesktopChecked = false;
-- static ULONG snDesktopStyle = STYLE_SYMBOLS_DEFAULT;
-+ static ULONG snDesktopStyle = STYLE_SYMBOLS_TANGO;
-
- if ( !sbDesktopChecked )
- {
- const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
-
- if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
-- snDesktopStyle = STYLE_SYMBOLS_INDUSTRIAL;
-+ snDesktopStyle = STYLE_SYMBOLS_TANGO;
- else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
- snDesktopStyle = STYLE_SYMBOLS_CRYSTAL;
-
+ if ( !sbFallbackDesktopChecked )
+ {
diff -ru vcl.orig/source/window/toolbox2.cxx vcl/source/window/toolbox2.cxx
--- openoffice.org.orig/vcl/source/window/toolbox2.cxx 2007-03-16 11:35:30.000000000 +0000
+++ openoffice.org/vcl/source/window/toolbox2.cxx 2007-03-16 11:37:59.000000000 +0000
@@ -125,53 +114,49 @@
diff -ru svx.orig/source/dialog/optgdlg.cxx svx/source/dialog/optgdlg.cxx
--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 2007-03-16 12:31:16.000000000 +0000
+++ openoffice.org/svx/source/dialog/optgdlg.cxx 2007-03-16 12:34:05.000000000 +0000
-@@ -913,10 +913,9 @@
+@@ -913,11 +913,9 @@
switch( nStyleLB_NewSelection )
{
case 0: eSet = SFX_SYMBOLS_STYLE_AUTO; break;
- case 1: eSet = SFX_SYMBOLS_STYLE_DEFAULT; break;
-+ case 1: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
- case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
+- case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
- case 3: eSet = SFX_SYMBOLS_STYLE_INDUSTRIAL; break;
- case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
-+ case 3: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
+- case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
++ case 1: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
++ case 2: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
++ case 3: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
default:
DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
}
-@@ -1083,10 +1082,9 @@
+@@ -1084,11 +1082,9 @@
{
switch ( aMiscOptions.GetCurrentSymbolsStyle() )
{
- case SFX_SYMBOLS_STYLE_DEFAULT: nStyleLB_InitialSelection = 1; break;
-+ case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 1; break;
- case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break;
+- case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break;
- case SFX_SYMBOLS_STYLE_INDUSTRIAL: nStyleLB_InitialSelection = 3; break;
- case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 4; break;
-+ case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 3; break;
+- case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 5; break;
++ case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 1; break;
++ case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 2; break;
++ case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 3; break;
default: nStyleLB_InitialSelection = 0; break;
}
}
diff -ru svx.orig/source/dialog/optgdlg.src svx/source/dialog/optgdlg.src
--- openoffice.org.orig/svx/source/dialog/optgdlg.src 2007-03-16 12:31:16.000000000 +0000
+++ openoffice.org/svx/source/dialog/optgdlg.src 2007-03-16 12:33:11.000000000 +0000
-@@ -269,17 +269,15 @@
- StringList [ de ] =
- {
- < "Automatisch" ; > ;
- < "Standard" ; > ;
- < "HiContrast" ; > ;
-- < "Industrial" ; > ;
- < "Crystal" ; > ;
- };
+@@ -238,9 +238,7 @@
StringList [ en-US ] =
{
< "Automatic" ; > ;
- < "Default" ; > ;
+- < "Default" ; > ;
< "HiContrast" ; > ;
- < "Industrial" ; > ;
< "Crystal" ; > ;
+ < "Tango" ; > ;
};
- };
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
@@ -179,28 +164,12 @@
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 @@
+@@ -946,7 +946,7 @@
.ENDIF
# additional image sets
--CUSTOM_IMAGE_SETS=hicontrast industrial crystal
-+CUSTOM_IMAGE_SETS=hicontrast tango crystal
+-CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango
++CUSTOM_IMAGE_SETS=hicontrast crystal tango
# 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
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch:
Index: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 17 Jul 2007 16:31:26 -0000 1.4
+++ openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 16 Aug 2007 07:04:22 -0000 1.5
@@ -96,14 +96,14 @@
diff -u -r1.13 swabstdlg.hxx
--- openoffice.org.orig/sw/inc/swabstdlg.hxx 26 Apr 2007 08:48:16 -0000 1.13
+++ openoffice.org/sw/inc/swabstdlg.hxx 10 Jul 2007 12:55:16 -0000
-@@ -476,6 +476,7 @@
+@@ -477,6 +477,7 @@
SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
- virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( const ResId& rResId,
+ virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
+ virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
- virtual VclAbstractDialog * CreateVclSwViewDialog( const ResId& rResId,
+ virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( const ResId& rResId,
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Index: sdi/_basesh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_basesh.sdi,v
@@ -196,7 +196,7 @@
#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
#include <mergetbl.hxx> //add for SwMergeTblDlg
#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
-@@ -1400,6 +1401,14 @@
+@@ -1405,6 +1406,14 @@
return 0;
}
@@ -208,7 +208,7 @@
+ return 0;
+}
+
- VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( const ResId& rResId,
+ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
{
Index: source/ui/dialog/swdlgfact.hxx
@@ -218,15 +218,14 @@
diff -u -r1.9 swdlgfact.hxx
--- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.hxx 26 Apr 2007 09:06:34 -0000 1.9
+++ openoffice.org/sw/source/ui/dialog/swdlgfact.hxx 10 Jul 2007 13:05:50 -0000
-@@ -531,6 +531,8 @@
+@@ -532,6 +532,7 @@
SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
- virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( const ResId& rResId,
+ virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
-+ virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
-+
- virtual VclAbstractDialog * CreateVclSwViewDialog( const ResId& rResId,
++ virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
+ virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( const ResId& rResId,
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Index: source/ui/inc/swmn_tmpl.hrc
===================================================================
RCS file: /cvs/sw/sw/source/ui/inc/swmn_tmpl.hrc,v
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1243
retrieving revision 1.1244
diff -u -r1.1243 -r1.1244
--- openoffice.org.spec 14 Aug 2007 12:38:46 -0000 1.1243
+++ openoffice.org.spec 16 Aug 2007 07:04:22 -0000 1.1244
@@ -1,13 +1,13 @@
-%define oootag OOF680
-%define ooomilestone 18
-%define rh_rpm_release 9
+%define oootag OOG680
+%define ooomilestone 1
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
# undef to revert to the traditional print dialog
%define gtkprintui 1
# undef to refrain from combining startup libs into a single libsoffice
-%define linkopt 1
+%define linkopt 0
# whether to use stlport or gcc's stl, we're basically locked to stlport
# for i386 to enable third party built against "vanilla OOo" uno components
# and add-ons to work with our OOo. We assume there aren't any such for the
@@ -34,7 +34,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.2.1
+Version: 2.3.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
@@ -58,7 +58,7 @@
BuildRequires: evolution-data-server-devel, libxslt-devel, desktop-file-utils
BuildRequires: libxslt-devel, db4-devel, firefox-devel, libwpd-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires: perl-Archive-Zip
+BuildRequires: perl-Archive-Zip, libtextcat-devel, vigra-devel
Patch0: openoffice.org-simple-crash_report.sh
Patch1: AutoSaveRecovery.xcu
@@ -78,79 +78,55 @@
%if %{gtkprintui}
Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch16: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch17: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch18: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch19: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch20: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch21: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
-Patch22: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch23: workspace.libxslt02.patch
-Patch24: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch25: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch27: workspace.fpicker6.patch
-Patch28: workspace.ppc64one.patch
-Patch29: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch30: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch31: ooobuild.VBAObjects.patch
-Patch32: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch33: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch34: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch35: pseudoworkspace.valgrind1.patch
-Patch36: workspace.thbpp6.patch
-Patch37: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch38: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch39: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch40: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch41: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch42: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch43: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch44: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch45: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch46: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch47: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch48: workspace.tl37.patch
-Patch49: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch50: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch52: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch53: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch54: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch55: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch56: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch57: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch58: workspace.configrefactor01.patch
-Patch59: workspace.sixtyfour11.patch
-Patch60: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch61: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch62: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch63: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch64: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch65: openoffice.org-2.2.0.rh232389.tango.patch
-Patch66: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch67: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch68: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch69: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
-Patch70: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch71: workspace.cmcfixes34.patch
-Patch72: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
-Patch73: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
-Patch74: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch75: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch76: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
-Patch77: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
-Patch78: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
-Patch79: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch80: workspace.glyphadv.patch
-Patch81: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
-Patch82: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch83: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch84: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
-Patch85: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
-Patch86: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch87: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch88: workspace.unifysound01.patch
+Patch16: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch17: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch18: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch19: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+Patch20: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
+Patch21: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch22: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch23: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch24: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch25: workspace.fpicker6.patch
+Patch26: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch27: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch28: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch29: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch30: pseudoworkspace.valgrind1.patch
+Patch31: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch32: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch33: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch34: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch35: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch36: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch37: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch38: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch39: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch40: workspace.tl37.patch
+Patch41: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch42: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch43: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch44: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch45: workspace.configrefactor01.patch
+Patch46: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch47: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch48: openoffice.org-2.2.0.rh232389.tango.patch
+Patch49: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch50: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch51: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch52: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch53: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch54: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch55: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch56: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch57: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch58: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
+Patch59: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch60: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch61: workspace.unifysound01.patch
+Patch62: libtextcat.xcu
+Patch63: workspace.npower7.patch
+Patch64: openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch
%define instdir %{_libdir}/openoffice.org
@@ -1019,83 +995,58 @@
%if %{gtkprintui}
%patch15 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch16 -p1 -b .rh156677.cripplemenus.sysui.patch
-%patch17 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch18 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch19 -p1 -b .ooo54603.fontconfig.patch
-%patch20 -p1 -b .ooo51931.fixxmlsec.patch
-%patch21 -p1 -b .ooo67740.doublefree.xmlhelp.patch
-%patch22 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch23 -p1 -b .workspace.libxslt02.patch
-%patch24 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch25 -p1
-%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch27 -p1 -b .workspace.fpicker6.patch
-%patch28 -p1 -b .workspace.ppc64one.patch
-%patch29 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch30 -p1 -b .rh187919.gtkunderkde.patch
-%patch31 -p0 -b .ooobuild.VBAObjects.patch
-%patch32 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch33 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch34 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch35 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch36 -p1 -b .workspace.thbpp6.patch
-%patch37 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch38 -p1 -b .rh217065.syncbackspace.patch
-%patch39 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch40 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch41 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch42 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH43} >> svtools/source/dialogs/localize.sdf
-%patch44 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch45 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch46 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch47 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch48 -p1 -b .tl37.patch
-%patch49 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch50 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch51 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch52 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch53 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch54 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch55 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch56 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch57 -p1 -b .ooo74401.basctl.boost.patch
-%patch58 -p1 -b .workspace.configrefactor01.patch
-%patch59 -p1 -b .workspace.sixtyfour11.patch
-%patch60 -p1 -b .ooo68717.gstreamer.video.patch
-%patch61 -p1 -b .ooo63159.sal.dtype.patch
-%patch62 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch63 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch64 -p1 -b .ooo75329.xdguserdir.patch
-%patch65 -p1 -b .rh232389.tango.patch
+%patch16 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch17 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch18 -p1 -b .ooo54603.fontconfig.patch
+%patch19 -p1 -b .ooo51931.fixxmlsec.patch
+%patch20 -p1 -b .ooo67740.doublefree.xmlhelp.patch
+%patch21 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch22 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch23 -p1
+%patch24 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch25 -p1 -b .workspace.fpicker6.patch
+%patch26 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch27 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch28 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch29 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch30 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch31 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch32 -p1 -b .rh217065.syncbackspace.patch
+%patch33 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch34 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch35 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH36} >> svtools/source/dialogs/localize.sdf
+%patch37 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch38 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch39 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch40 -p1 -b .tl37.patch
+%patch41 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch42 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch43 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch44 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch45 -p0 -b .workspace.configrefactor01.patch
+%patch46 -p0 -b .ooo68717.gstreamer.video.patch
+%patch47 -p1 -b .ooo63159.sal.dtype.patch
+%patch48 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch66 -p1 -b .ooo53397.linkopt.patch
+%patch49 -p1 -b .ooo53397.linkopt.patch
%endif
-%patch67 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch68 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch69 -p1 -b .oooXXXXX.shell.reduceglobals.patch
-%patch70 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch71 -p1 -b .workspace.cmcfixes34.patch
-%patch72 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
-%patch73 -p1 -b .ooo73728.desktop.mapped_type.patch
+%patch50 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch51 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch52 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
%if %{linkopt}
-%patch74 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch53 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
-%patch75 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch76 -p1 -b .ooo78198.sixtyfour.svx.patch
-%patch77 -p1 -b .ooo78383.vcl.printxerror.patch
-%patch78 -p1 -b .ooo78392.sixtyfour.tools.patch
-%patch79 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch80 -p1 -b .workspace.glyphadv.patch
-%patch81 -p1 -b .ooo78921.sw.embedded.patch
-%patch82 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch83 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch84 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
-%patch85 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-%patch86 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH87}
-%patch88 -p1 -b .workspace.unifysound01.patch
+%patch54 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch55 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch56 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch57 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch58 -p1 -b .ooo79878.vcl.honourwidthtype.patch
+%patch59 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH60}
+%patch61 -p1 -b .workspace.unifysound01.patch
+%patch63 -p1 -b .workspace.npower7.patch
+%patch64 -p1 -b .oooXXXXX.sw.stlportism.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -1108,10 +1059,11 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{release} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --disable-neon --with-ant-home=/usr/share/ant --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-!
ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
+unset HAVE_LD_HASH_STYLE
#faster build
export nodep=true
export NO_HIDS=true
@@ -1126,7 +1078,7 @@
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-export ARCH_FLAGS="$ARCH_FLAGS -D_FILE_OFFSET_BITS=64 -finline-limit=64"
+export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=64"
#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
export CXX="$CXX -fno-threadsafe-statics"
#convert _smp_mflags to dmake equivalent
@@ -1186,6 +1138,7 @@
%install
source Linux*Env.Set.sh
+unset HAVE_LD_HASH_STYLE
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
cd instsetoo_native/util
@@ -1238,6 +1191,8 @@
#default autosave settings
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
+#libtextcat fingerprint location
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH62}
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
@@ -1453,32 +1408,37 @@
echo exec %{instdir}/program/soffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
-chmod u+w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop
-echo "TryExec=oobase" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop
-echo "TryExec=oocalc" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop
-echo "TryExec=ooimpress" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop
-echo "TryExec=oowriter" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
-echo "TryExec=oomath" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
-echo "TryExec=oodraw" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
+pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
+chmod u+w *.desktop
+# rhbz#156677 use GenericNames
+for file in *.desktop; do
+ desktop-file-install --copy-generic-name-to-name --remove-key=GenericName $file --dir `pwd`
+done
+echo "StartupNotify=true" >> base.desktop
+echo "TryExec=oobase" >> base.desktop
+echo "StartupNotify=true" >> calc.desktop
+echo "TryExec=oocalc" >> calc.desktop
+echo "StartupNotify=true" >> impress.desktop
+echo "TryExec=ooimpress" >> impress.desktop
+echo "StartupNotify=true" >> writer.desktop
+echo "TryExec=oowriter" >> writer.desktop
+echo "StartupNotify=true" >> math.desktop
+echo "TryExec=oomath" >> math.desktop
+echo "StartupNotify=true" >> draw.desktop
+echo "TryExec=oodraw" >> draw.desktop
# rh#156677# / rh#186515#
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
-chmod u-w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
-
-#relocate the .desktop and icon files
+echo "NoDisplay=true" >> math.desktop
+echo "NoDisplay=true" >> draw.desktop
+chmod u-w *.desktop
+# relocate the .desktop and icon files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
+cp -p calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
+cp -p impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
+cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+popd
#get rid of the gnome icons
rm -rf sysui/output/usr/share/icons/gnome
#relocate the rest of them
@@ -2691,9 +2651,45 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Tue Aug 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.9
+* Tue Aug 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-1.1
- Resolves: rhbz#251896 count from start of ctl sequence, not start of
string when doing range test
+- first 2.3.0 prerelease candidate
+ + disable neon until 0.26 series is in fedora
+ + unset HAVE_LD_HASH_STYLE because both is enabled despite constantly
+ saying that was a stupid idea to hardcode
+ + large file support upstreamed
+ + add libtextcat.xcu -> reuse libtextcat fingerprints
+ + add workspace.npower7.patch for build failure
+ + add openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch for build failure
+ + replace openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+ with integrated GenericName support
+ + drop integrated workspace.libxslt02.patch
+ + drop integrated workspace.ppc64one.patch
+ + drop integrated openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+ + drop integrated ooobuild.VBAObjects.patch and use --enable-vba
+ + drop integrated openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+ + drop integrated workspace.thbpp6.patch
+ + drop integrated openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+ + drop integrated openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+ + drop integrated openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+ + drop integrated openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+ + drop integrated openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+ + drop integrated workspace.sixtyfour11.patch
+ + drop integrated openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+ + drop integrated openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+ + drop integrated openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+ + drop integrated openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
+ + drop integrated workspace.cmcfixes34.patch
+ + drop integrated openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
+ + drop integrated openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
+ + drop integrated openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
+ + drop integrated openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
+ + drop integrated openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
+ + drop integrated workspace.glyphadv.patch
+ + drop integrated openoffice.org-2.2.1.ooo78921.sw.embedded.patch
+ + drop integrated openoffice.org.ooo79953.dbusinhibitscreensaver.patch
+ + drop integrated openoffice.org-2.2.0.ooo74401.basctl.boost.patch
* Fri Aug 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.8
- clarify licenses is use in OOo
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pseudoworkspace.valgrind1.patch 19 May 2007 11:28:07 -0000 1.18
+++ pseudoworkspace.valgrind1.patch 16 Aug 2007 07:04:22 -0000 1.19
@@ -13,24 +13,6 @@
nNumItemId(SID_ATTR_NUMBERING_RULE),
bInInintControl(FALSE)
{
-Index: bf_sfx2/source/explorer/sfx2_nochaos.cxx
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 sfx2_nochaos.cxx
---- openoffice.org.orig/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx 8 Sep 2005 03:19:32 -0000 1.4
-+++ openoffice.org/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx 9 Jan 2007 14:56:16 -0000
-@@ -212,8 +212,8 @@
- /*N*/ m_ppDefaults( new SfxPoolItem* [ m_nItems ] ),
- /*N*/ m_pItemInfos( new SfxItemInfo [ m_nItems ] )
- /*N*/ {
--/*N*/ rtl_zeroMemory( m_ppDefaults, sizeof( m_ppDefaults ) * m_nItems );
--/*N*/ rtl_zeroMemory( m_pItemInfos, sizeof( m_pItemInfos ) * m_nItems );
-+/*N*/ rtl_zeroMemory( m_ppDefaults, sizeof( SfxPoolItem* ) * m_nItems );
-+/*N*/ rtl_zeroMemory( m_pItemInfos, sizeof( SfxItemInfo ) * m_nItems );
- /*N*/
- /*N*/ Insert(
- /*N*/ new SfxStringItem( WID_CHAOS_START, String() ),
Index: source/core/txtnode/swfont.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/txtnode/swfont.cxx,v
@@ -47,41 +29,3 @@
SwUnderlineFont* pUnderFnt = 0;
if( rInf.GetUnderFnt() )
-Index: inc/viewfrm.hxx
-===================================================================
-RCS file: /cvs/framework/sfx2/inc/viewfrm.hxx,v
-retrieving revision 1.24
-diff -u -r1.24 viewfrm.hxx
---- openoffice.org.orig/sfx2/inc/viewfrm.hxx 12 Dec 2006 19:28:13 -0000 1.24
-+++ openoffice.org/sfx2/inc/viewfrm.hxx 5 Apr 2007 10:42:26 -0000
-@@ -109,6 +109,14 @@
- }
- BOOL operator != ( const SvBorder & rObj ) const
- { return !(*this == rObj); }
-+ SvBorder & operator = ( const SvBorder & rBorder )
-+ {
-+ Left() = rBorder.Left();
-+ Top() = rBorder.Top();
-+ Right() = rBorder.Right();
-+ Bottom() = rBorder.Bottom();
-+ return *this;
-+ }
- SvBorder & operator += ( const SvBorder & rBorder )
- {
- Left() += rBorder.Left();
-Index: source/msfilter/msdffimp.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
-retrieving revision 1.144.42.3
-diff -u -r1.144.42.3 msdffimp.cxx
---- openoffice.org.orig/svx/source/msfilter/msdffimp.cxx 19 Jan 2007 16:46:49 -0000 1.144.42.3
-+++ openoffice.org/svx/source/msfilter/msdffimp.cxx 5 Apr 2007 13:57:43 -0000
-@@ -6969,7 +6969,7 @@
-
- // nachschauen, ob es sich auch wirklich um ein BLIP handelt
- UINT32 nLength;
-- USHORT nInst, nFbt;
-+ USHORT nInst, nFbt(0);
- BYTE nVer;
- if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
- {
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- sources 26 Jul 2007 09:42:38 -0000 1.242
+++ sources 16 Aug 2007 07:04:22 -0000 1.243
@@ -4,4 +4,4 @@
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
-db12596a2a667fb5c2a6c8467dcc9223 OOF680_m18.tar.bz2
+239fccd6598948ac99a93b978fc8ad64 OOG680_m1.tar.bz2
workspace.configrefactor01.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 workspace.configrefactor01.patch
Index: workspace.configrefactor01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.configrefactor01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.configrefactor01.patch 24 May 2007 12:45:39 -0000 1.2
+++ workspace.configrefactor01.patch 16 Aug 2007 07:04:22 -0000 1.3
@@ -1,7 +1,9 @@
-Index: util/configmgr/qa/unit/export.map
-diff -u /dev/null util/configmgr/qa/unit/export.map:1.1.2.1
---- /dev/null Wed Feb 21 04:50:14 2007
-+++ util/configmgr/qa/unit/export.map Mon Feb 5 07:21:44 2007
+Index: configmgr/qa/unit/export.map
+===================================================================
+RCS file: configmgr/qa/unit/export.map
+diff -N configmgr/qa/unit/export.map
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/qa/unit/export.map 5 Feb 2007 15:21:44 -0000 1.1.2.1
@@ -0,0 +1,7 @@
+UDK_3.0 {
+ global:
@@ -10,10 +12,12 @@
+ local:
+ *;
+};
-Index: util/configmgr/qa/unit/makefile.mk
-diff -u /dev/null util/configmgr/qa/unit/makefile.mk:1.1.2.2
---- /dev/null Wed Feb 21 04:50:14 2007
-+++ util/configmgr/qa/unit/makefile.mk Thu Feb 8 04:44:56 2007
+Index: configmgr/qa/unit/makefile.mk
+===================================================================
+RCS file: configmgr/qa/unit/makefile.mk
+diff -N configmgr/qa/unit/makefile.mk
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/qa/unit/makefile.mk 8 Feb 2007 12:44:56 -0000 1.1.2.2
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
@@ -79,10 +83,12 @@
+
+test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
+ testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET).rdb#$(PWD)$/$(MISC)$/$(TARGET).registry"
-Index: util/configmgr/qa/unit/performance.cxx
-diff -u /dev/null util/configmgr/qa/unit/performance.cxx:1.1.2.3
---- /dev/null Wed Feb 21 04:50:14 2007
-+++ util/configmgr/qa/unit/performance.cxx Thu Feb 8 04:44:56 2007
+Index: configmgr/qa/unit/performance.cxx
+===================================================================
+RCS file: configmgr/qa/unit/performance.cxx
+diff -N configmgr/qa/unit/performance.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/qa/unit/performance.cxx 8 Feb 2007 12:44:56 -0000 1.1.2.3
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
@@ -222,11 +228,15 @@
+}
+
+NOADDITIONAL;
-Index: util/configmgr/source/api/confeventhelpers.cxx
-diff -u util/configmgr/source/api/confeventhelpers.cxx:1.14 util/configmgr/source/api/confeventhelpers.cxx:1.14.24.1
---- util/configmgr/source/api/confeventhelpers.cxx:1.14 Sat Sep 16 07:52:51 2006
-+++ util/configmgr/source/api/confeventhelpers.cxx Fri Jan 12 09:51:16 2007
-@@ -177,7 +177,6 @@
+Index: configmgr/source/api/confeventhelpers.cxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/api/confeventhelpers.cxx,v
+retrieving revision 1.14
+retrieving revision 1.14.24.1
+diff -u -p -r1.14 -r1.14.24.1
+--- configmgr/source/api/confeventhelpers.cxx 16 Sep 2006 14:52:51 -0000 1.14
++++ configmgr/source/api/confeventhelpers.cxx 12 Jan 2007 17:51:16 -0000 1.14.24.1
+@@ -177,7 +177,6 @@ void ConfigChangesBroadcasterImpl::dispa
(
INodeListenerRef const& pTarget,
AbsolutePath const& _aTargetPath,
@@ -234,7 +244,7 @@
Change const& rBaseChange,
AbsolutePath const& _aChangeLocation,
sal_Bool , //_bError,
-@@ -198,10 +197,10 @@
+@@ -198,10 +197,10 @@ void ConfigChangesBroadcasterImpl::dispa
OSL_ASSERT( !pTargetChange || matches(_aChangeLocation.compose(aLocalPath),_aTargetPath) );
if (pRemoved)
@@ -247,7 +257,7 @@
}
catch (InvalidName& )
-@@ -215,7 +214,6 @@
+@@ -215,7 +214,6 @@ void ConfigChangesBroadcasterImpl::dispa
(
INodeListenerRef const& pTarget,
AbsolutePath const& _aTargetPath,
@@ -255,7 +265,7 @@
Change const& rBaseChange,
AbsolutePath const& _aChangeLocation,
sal_Bool , //_bError,
-@@ -226,13 +224,13 @@
+@@ -226,13 +224,13 @@ void ConfigChangesBroadcasterImpl::dispa
OSL_ASSERT(pTarget.is());
OSL_ASSERT( Path::hasPrefix( _aChangeLocation, _aTargetPath) );
@@ -272,7 +282,7 @@
}
/////////////////////////////////////////////////////////////////////////
namespace
-@@ -250,7 +248,6 @@
+@@ -250,7 +248,6 @@ namespace
/////////////////////////////////////////////////////////////////////////
void ConfigChangesBroadcasterImpl::dispatch
(
@@ -280,7 +290,7 @@
Change const& rBaseChange,
AbsolutePath const& _aChangeLocation,
sal_Bool _bError,
-@@ -305,10 +302,10 @@
+@@ -305,10 +302,10 @@ void ConfigChangesBroadcasterImpl::dispa
aGuard.clear();
{for (DispatchTargets::const_iterator it = aOuterTargets.begin(); it != aOuterTargets.end(); ++it){
@@ -293,11 +303,15 @@
}}
}
-Index: util/configmgr/source/api/confeventhelpers.hxx
-diff -u util/configmgr/source/api/confeventhelpers.hxx:1.10 util/configmgr/source/api/confeventhelpers.hxx:1.10.84.1
---- util/configmgr/source/api/confeventhelpers.hxx:1.10 Wed Sep 7 20:03:44 2005
-+++ util/configmgr/source/api/confeventhelpers.hxx Fri Jan 12 09:51:16 2007
-@@ -199,8 +199,8 @@
+Index: configmgr/source/api/confeventhelpers.hxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/api/confeventhelpers.hxx,v
+retrieving revision 1.10
+retrieving revision 1.10.84.1
+diff -u -p -r1.10 -r1.10.84.1
+--- configmgr/source/api/confeventhelpers.hxx 8 Sep 2005 03:03:44 -0000 1.10
++++ configmgr/source/api/confeventhelpers.hxx 12 Jan 2007 17:51:16 -0000 1.10.84.1
+@@ -199,8 +199,8 @@ namespace configmgr
// void removed(OUString const& aPath, bool bRemovedFromModel, IConfigBroadcaster* pSource);
@@ -308,7 +322,7 @@
void disposing(IConfigBroadcaster* pSource);
private:
typedef BroadcastImplHelper<NodeListenerInfo> Listeners;
-@@ -209,8 +209,8 @@
+@@ -209,8 +209,8 @@ namespace configmgr
Listeners m_aListeners;
PathMap m_aPathMap;
private:
@@ -319,11 +333,15 @@
};
/////////////////////////////////////////////////////////////////////////
-Index: util/configmgr/source/api/confevents.cxx
-diff -u util/configmgr/source/api/confevents.cxx:1.9 util/configmgr/source/api/confevents.cxx:1.9.24.2
---- util/configmgr/source/api/confevents.cxx:1.9 Sat Sep 16 07:53:04 2006
-+++ util/configmgr/source/api/confevents.cxx Fri Jan 12 09:51:16 2007
-@@ -63,7 +63,7 @@
+Index: configmgr/source/api/confevents.cxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/api/confevents.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.24.2
+diff -u -p -r1.9 -r1.9.24.2
+--- configmgr/source/api/confevents.cxx 16 Sep 2006 14:53:04 -0000 1.9
++++ configmgr/source/api/confevents.cxx 12 Jan 2007 17:51:16 -0000 1.9.24.2
+@@ -63,7 +63,7 @@ namespace configmgr
ConfigChangeBroadcastHelper();
~ConfigChangeBroadcastHelper();
@@ -332,7 +350,7 @@
public:
// IConfigBroadcaster implementation helper
-@@ -118,20 +118,12 @@
+@@ -118,20 +118,12 @@ namespace configmgr
}
}
@@ -355,7 +373,7 @@
}
}
-@@ -167,9 +159,9 @@
+@@ -167,9 +159,9 @@ namespace configmgr
}
*/
/////////////////////////////////////////////////////////////////////////
@@ -367,10 +385,14 @@
}
-Index: util/configmgr/source/api/confsvccomponent.cxx
-diff -u util/configmgr/source/api/confsvccomponent.cxx:1.6 util/configmgr/source/api/confsvccomponent.cxx:1.6.24.1
---- util/configmgr/source/api/confsvccomponent.cxx:1.6 Sat Sep 16 07:53:18 2006
-+++ util/configmgr/source/api/confsvccomponent.cxx Thu Jan 11 12:15:55 2007
+Index: configmgr/source/api/confsvccomponent.cxx
[...13057 lines suppressed...]
- { return doGetDataSegmentForUpdate(); }
-
+-
//-----------------------------------------------------------------------------
}
-Index: util/configmgr/util/makefile.mk
-diff -u util/configmgr/util/makefile.mk:1.21 util/configmgr/util/makefile.mk:1.19.84.2
---- util/configmgr/util/makefile.mk:1.21 Wed Jan 31 00:43:09 2007
-+++ util/configmgr/util/makefile.mk Wed Feb 7 03:45:28 2007
-@@ -46,7 +46,6 @@
+ //-----------------------------------------------------------------------------
+Index: configmgr/util/makefile.mk
+===================================================================
+RCS file: /cvs/util/configmgr/util/makefile.mk,v
+retrieving revision 1.21
+retrieving revision 1.19.84.2
+diff -u -p -r1.21 -r1.19.84.2
+--- configmgr/util/makefile.mk 31 Jan 2007 08:43:09 -0000 1.21
++++ configmgr/util/makefile.mk 7 Feb 2007 11:45:28 -0000 1.19.84.2
+@@ -46,7 +46,6 @@ DLLPRE =
# --- Library -----------------------------------
SHL1TARGET= $(CFGMGR_TARGET)$(CFGMGR_MAJOR).uno
@@ -17296,65 +20626,120 @@
SHL1VERSIONMAP= $(TARGET).map
SHL1OBJS=$(SLOFILES)
-Index: util/configmgr/workben/makefile.mk
-diff -u util/configmgr/workben/makefile.mk:1.4 util/configmgr/workben/makefile.mk:1.4.58.2
---- util/configmgr/workben/makefile.mk:1.4 Wed Mar 8 06:02:03 2006
-+++ util/configmgr/workben/makefile.mk Thu Jan 11 02:35:42 2007
-@@ -55,35 +55,7 @@
- # CFGDEMO
- #
- APP1TARGET= cfgdemo
--APP1OBJS=\
-- $(OBJ)$/treetests.obj \
-- $(SLO)$/xmltreebuilder.obj \
-- $(SLO)$/xmlformater.obj \
-- $(SLO)$/attributes.obj \
-- $(SLO)$/changes.obj \
-- $(SLO)$/confname.obj \
-- $(SLO)$/typeconverter.obj \
-- $(SLO)$/synchronize.obj \
-- $(SLO)$/cmtree.obj \
-- $(SLO)$/cmtreemodel.obj \
-- $(SLO)$/localsession.obj \
-- $(SLO)$/mergeupdates.obj \
-- $(SLO)$/oslstream.obj \
-- $(SLO)$/saxtools.obj \
-- $(SLO)$/configsession.obj \
-- $(SLO)$/strimpl.obj \
-- $(SLO)$/tracer.obj \
-- $(SLO)$/confchangesset.obj \
-- $(SLO)$/filehelper.obj \
-- $(SLO)$/strconverter.obj \
-- $(SLO)$/updatedom.obj \
-- $(SLO)$/valuehandler.obj \
-- $(SLO)$/dataconverter.obj \
--
--# $(OBJ)$/cmxmlexport.obj \
--# $(OBJ)$/cmxmlimport.obj \
--
--#APP1RES= $(RES)$/ucbdemo.res
+Index: configmgr/workben/makefile.mk
+===================================================================
+RCS file: /cvs/util/configmgr/workben/Attic/makefile.mk,v
+retrieving revision 1.4
+retrieving revision 1.4.58.2
+diff -u -p -r1.4 -r1.4.58.2
+--- configmgr/workben/makefile.mk 8 Mar 2006 14:02:03 -0000 1.4
++++ configmgr/workben/makefile.mk 11 Jan 2007 10:35:42 -0000 1.4.58.2
+@@ -0,0 +1,99 @@ USE_LDUMP2=TRUE
++#*************************************************************************
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile$
++#
++# $Revision$
++#
++# last change: $Author$ $Date$
++#
++# The Contents of this file are made available subject to
++# the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++# GNU Lesser General Public License Version 2.1
++# =============================================
++# Copyright 2005 by Sun Microsystems, Inc.
++# 901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License version 2.1, as published by the Free Software Foundation.
++#
++# This library 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 for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++#*************************************************************************
++
++PRJ=..
++
++PRJINC=..$/source
++
++PRJNAME=configmgr
++TARGETTYPE=CUI
++TARGET=cm
++LIBTARGET=NO
++ENABLE_EXCEPTIONS=TRUE
++
++USE_LDUMP2=TRUE
++
++# --- Settings ---
++
++.INCLUDE : settings.mk
++
++# --- Files ---
++
++#
++# CFGDEMO
++#
++APP1TARGET= cfgdemo
+APP1OBJS= $(OBJ)$/testapp.obj
-
- APP1STDLIBS=\
- $(SALLIB) \
-@@ -91,11 +63,12 @@
- $(STDLIBCPP) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
++
++APP1STDLIBS=\
++ $(SALLIB) \
++ $(VOSLIB) \
++ $(STDLIBCPP) \
++ $(CPPULIB) \
++ $(CPPUHELPERLIB) \
+ $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(UUILIB) \
- $(SVTOOLLIB) \
-- $(SVLIB)
++ $(UNOTOOLSLIB) \
++ $(TOOLSLIB) \
++ $(UUILIB) \
++ $(SVTOOLLIB) \
+ $(SVLIB)
-
- .IF "$(GUI)"=="WNT"
- APP1STDLIBS+=$(LIBCIMT)
-Index: util/configmgr/workben/testapp.cxx
-diff -u /dev/null util/configmgr/workben/testapp.cxx:1.1.2.4
---- /dev/null Wed Feb 21 04:50:23 2007
-+++ util/configmgr/workben/testapp.cxx Tue Jan 16 04:57:13 2007
++
++.IF "$(GUI)"=="WNT"
++APP1STDLIBS+=$(LIBCIMT)
++.ENDIF
++
++
++# APP1DEF= $(MISC)\$(APP1TARGET).def
++
++## important for create a Lib
++## SHL1TARGET= $(TARGET)
++##
++## SHL1STDLIBS= \
++## $(CPPULIB) \
++## $(CPPUHELPERLIB) \
++## $(VOSLIB) \
++## $(SALLIB)
++##
++## SHL1DEPN=
++## SHL1IMPLIB= i$(TARGET)
++## SHL1LIBS= $(SLB)$/$(TARGET).lib
++## SHL1DEF= $(MISC)$/$(SHL1TARGET).def
++##
++## DEF1NAME= $(SHL1TARGET)
++## DEF1EXPORTFILE= exports.dxp
++
++# --- Targets ---
++
++.INCLUDE : target.mk
+Index: configmgr/workben/testapp.cxx
+===================================================================
+RCS file: configmgr/workben/testapp.cxx
+diff -N configmgr/workben/testapp.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/workben/testapp.cxx 16 Jan 2007 12:57:13 -0000 1.1.2.4
@@ -0,0 +1,274 @@
+#include <stdio.h>
+#include <memory>
workspace.fpicker6.patch:
Index: workspace.fpicker6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fpicker6.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.fpicker6.patch 22 Jan 2007 09:27:00 -0000 1.3
+++ workspace.fpicker6.patch 16 Aug 2007 07:04:22 -0000 1.4
@@ -368,7 +368,7 @@
// fill the rpURLList
- Sequence < OUString > aPathSeq = mxFileDlg->getFiles();
-+ Reference<XFilePickerWorkaround> xFileWorkarounds(mxFileDlg, UNO_QUERY);
++ uno::Reference<XFilePickerWorkaround> xFileWorkarounds(mxFileDlg, UNO_QUERY);
+ Sequence < OUString > aPathSeq;
+ if (xFileWorkarounds.is())
+ {
workspace.tl37.patch:
Index: workspace.tl37.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.tl37.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.tl37.patch 31 May 2007 16:20:24 -0000 1.2
+++ workspace.tl37.patch 16 Aug 2007 07:04:23 -0000 1.3
@@ -5,26 +5,29 @@
diff -u -r1.114 impedit2.cxx
--- openoffice.org.orig/svx/source/editeng/impedit2.cxx 12 Oct 2006 12:39:14 -0000 1.114
+++ openoffice.org/svx/source/editeng/impedit2.cxx 31 May 2007 15:56:08 -0000
-@@ -1764,9 +1764,21 @@
-
+@@ -1768,9 +1768,22 @@
+ // well as with just moving the cursor from char to char.
USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
USHORT nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
+- for ( USHORT n = 0; n < rTypes.Count(); n++ )
+- {
+- if (rTypes[n].nStartPos <= nS && nE <= rTypes[n].nEndPos)
+
-+ // Find all the scripts types that intersect the selection.
-+ // For moving cursor from char to char then we have no selection,
-+ // so use a selection over the previous character if there was one.
-+ // If there is no previous character, then we'll eventually fallback
-+ // to the input language.
-+ if ( !rSel.HasRange() && nS )
-+ {
-+ DBG_ASSERT( nS == nE && nStartPara == nEndPara, "Move in sich selbst ?" );
-+ --nS;
-+ }
+
- for ( USHORT n = 0; n < rTypes.Count(); n++ )
- {
-- if ( ( rTypes[n].nStartPos <= nE ) && ( rTypes[n].nEndPos >= nS ) )
-+ if ( ( nS < rTypes[n].nEndPos ) && ( nE > rTypes[n].nStartPos ) )
++ // Find all the scripts types that intersect the selection.
++ // For moving cursor from char to char then we have no selection,
++ // so use a selection over the previous character if there was one.
++ // If there is no previous character, then we'll eventually fallback
++ // to the input language.
++ if ( !rSel.HasRange() && nS )
++ {
++ DBG_ASSERT( nS == nE && nStartPara == nEndPara, "Move in sich selbst ?" );
++ --nS;
++ }
++
++ for ( USHORT n = 0; n < rTypes.Count(); n++ )
++ {
++ if ( ( nS < rTypes[n].nEndPos ) && ( nE > rTypes[n].nStartPos ) )
{
if ( rTypes[n].nScriptType != i18n::ScriptType::WEAK )
{
workspace.unifysound01.patch:
Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- workspace.unifysound01.patch 10 Aug 2007 09:42:08 -0000 1.8
+++ workspace.unifysound01.patch 16 Aug 2007 07:04:23 -0000 1.9
@@ -366,7 +366,7 @@
+#include <vcl/salstype.hxx>
+#endif
+
-+#include <mediawindow.hxx>
++#include "avmedia/mediawindow.hxx"
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/factory.hxx>
+
@@ -980,8 +980,8 @@
for( i = 0; i < LIST_LAST; i++ )
{
-@@ -252,27 +255,6 @@
- gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pToggles[i], FALSE, TRUE, 0 );
+@@ -260,27 +263,6 @@
+ gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], FALSE, FALSE, 0 );
}
- for( i = 0; i < BUTTON_LAST; i++ )
@@ -1002,13 +1002,13 @@
- break;
- }
-
-- gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pButtons[i], FALSE, TRUE, 0 );
+- gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pButtons[i], FALSE, TRUE, 0 );
- }
-
for( i = 0; i < LIST_LAST; i++ )
{
m_pHBoxs[i] = gtk_hbox_new( FALSE, 0 );
-@@ -1106,6 +1088,16 @@
+@@ -1114,6 +1096,16 @@
retVal = ExecutableDialogResults::CANCEL;
break;
@@ -1025,7 +1025,7 @@
default:
retVal = 0;
break;
-@@ -1396,14 +1388,12 @@
+@@ -1407,14 +1399,12 @@
OSL_TRACE("enable unknown control %d\n", nControlId );
}
@@ -1041,7 +1041,7 @@
GType tType;
GtkWidget *pWidget;
-@@ -1412,7 +1402,18 @@
+@@ -1423,7 +1413,18 @@
OSL_TRACE("Set label on unknown control %d\n", nControlId);
return;
}
@@ -1061,7 +1061,7 @@
g_object_set( pWidget, "label", aTxt.getStr(),
"use_underline", TRUE, (char *)NULL );
else
-@@ -1710,6 +1711,7 @@
+@@ -1721,6 +1722,7 @@
case FILEOPEN_PLAY:
eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
first_button_text = GTK_STOCK_OPEN;
@@ -1069,7 +1069,7 @@
// TODO
break;
case FILEOPEN_READONLY_VERSION:
-@@ -1750,7 +1752,13 @@
+@@ -1761,7 +1763,13 @@
gtk_file_chooser_set_action( GTK_FILE_CHOOSER( m_pDialog ), eAction);
dialog_remove_buttons( GTK_DIALOG( m_pDialog ) );
gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
@@ -1083,7 +1083,7 @@
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
// Setup special flags
-@@ -2015,9 +2023,6 @@
+@@ -2026,9 +2034,6 @@
for( i = 0; i < TOGGLE_LAST; i++ )
gtk_widget_destroy( m_pToggles[i] );
@@ -1177,7 +1177,7 @@
diff -u -r1.38 registerservices.cxx
--- openoffice.org.orig/framework/source/register/registerservices.cxx 17 Jul 2007 13:25:41 -0000 1.38
+++ openoffice.org/framework/source/register/registerservices.cxx 8 Aug 2007 09:09:49 -0000
-@@ -92,10 +92,6 @@
+@@ -89,10 +89,6 @@
#include <jobs/jobexecutor.hxx>
#endif
@@ -1188,18 +1188,18 @@
#ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_
#include <recording/dispatchrecordersupplier.hxx>
#endif
-@@ -285,7 +281,6 @@
+@@ -281,7 +277,6 @@
+ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer )
COMPONENTINFO( ::framework::Desktop )
COMPONENTINFO( ::framework::Frame )
- COMPONENTINFO( ::framework::DocumentProperties )
- COMPONENTINFO( ::framework::SoundHandler )
COMPONENTINFO( ::framework::JobExecutor )
COMPONENTINFO( ::framework::DispatchRecorderSupplier )
COMPONENTINFO( ::framework::DispatchRecorder )
-@@ -344,7 +339,6 @@
+@@ -335,7 +330,6 @@
+ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else
IFFACTORY( ::framework::Desktop ) else
IFFACTORY( ::framework::Frame ) else
- IFFACTORY( ::framework::DocumentProperties ) else
- IFFACTORY( ::framework::SoundHandler ) else
IFFACTORY( ::framework::JobExecutor ) else
IFFACTORY( ::framework::DispatchRecorderSupplier ) else
@@ -1276,7 +1276,7 @@
diff -ru SRC680_m224/sd/source/ui/animations/CustomAnimationDialog.cxx SRC680_m223/sd/source/ui/animations/CustomAnimationDialog.cxx
--- openoffice.org.orig/sd/source/ui/animations/CustomAnimationDialog.cxx 2007-08-03 09:27:54.000000000 +0100
+++ openoffice.org/sd/source/ui/animations/CustomAnimationDialog.cxx 2007-08-02 14:10:26.000000000 +0100
-@@ -180,6 +180,8 @@
+@@ -178,6 +178,8 @@
#include "STLPropertySet.hxx"
#endif
@@ -1285,7 +1285,7 @@
#include "filedlg.hxx"
#include "strings.hrc"
#include "helpids.h"
-@@ -1282,7 +1284,6 @@
+@@ -1280,7 +1282,6 @@
FixedText* mpFTTextDelay;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
@@ -1293,7 +1293,7 @@
};
-@@ -1942,19 +1943,6 @@
+@@ -1940,19 +1941,6 @@
mpLBSound->SelectEntryPos( (USHORT) nPos );
}
@@ -1301,19 +1301,19 @@
-// these strings from avmedia, or provide an XManager
-// factory there
-#ifdef GSTREAMER
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-#else
-#ifdef WNT
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
-#else
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
--#endif
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+-#endif
-#endif
-
void CustomAnimationEffectTabPage::onSoundPreview()
{
const USHORT nPos = mpLBSound->GetSelectEntryPos();
-@@ -1962,18 +1950,7 @@
+@@ -1960,18 +1948,7 @@
if( nPos >= 2 ) try
{
const OUString aSoundURL( *(String*)maSoundList.GetObject( nPos-2 ) );
@@ -1321,9 +1321,9 @@
- if( !mxManager.is() )
- {
- uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
--
+-
- mxManager.set(
-- xFac->createInstance(
+- xFac->createInstance(
- ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
- uno::UNO_QUERY_THROW );
- }
@@ -1669,7 +1669,7 @@
diff -ru SRC680_m224/sd/source/ui/slideshow/slideshowimpl.cxx SRC680_m223/sd/source/ui/slideshow/slideshowimpl.cxx
--- openoffice.org.orig/sd/source/ui/slideshow/slideshowimpl.cxx 2007-08-03 09:27:57.000000000 +0100
+++ openoffice.org/sd/source/ui/slideshow/slideshowimpl.cxx 2007-08-02 14:08:33.000000000 +0100
-@@ -119,19 +119,7 @@
+@@ -116,19 +116,7 @@
#include "slideshow.hrc"
#include "canvas/elapsedtime.hxx"
#include "canvas/prioritybooster.hxx"
@@ -1678,19 +1678,19 @@
-// these strings from avmedia, or provide an XManager
-// factory there
-#ifdef GSTREAMER
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-#else
-#ifdef WNT
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
-#else
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
-#endif
--#endif
+-#endif
+#include "avmedia/mediawindow.hxx"
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::UNO_QUERY_THROW;
-@@ -1691,17 +1679,7 @@
+@@ -1698,17 +1686,7 @@
{
try
{
@@ -1786,8 +1786,8 @@
RCS file: /cvs/gsl/vcl/inc/vcl/salinst.hxx,v
retrieving revision 1.2
diff -u -r1.2 salinst.hxx
---- openoffice.org.orig/vcl/inc/salinst.hxx 11 Apr 2007 18:07:19 -0000 1.2
-+++ openoffice.org/vcl/inc/salinst.hxx 8 Aug 2007 09:48:33 -0000
+--- openoffice.org.orig/vcl/inc/vcl/salinst.hxx 11 Apr 2007 18:07:19 -0000 1.2
++++ openoffice.org/vcl/inc/vcl/salinst.hxx 8 Aug 2007 09:48:33 -0000
@@ -60,7 +60,6 @@
class SalGraphics;
class SalFrame;
@@ -1810,8 +1810,8 @@
RCS file: /cvs/gsl/vcl/inc/vcl/settings.hxx,v
retrieving revision 1.3
diff -u -r1.3 settings.hxx
---- openoffice.org.orig/vcl/inc/settings.hxx 4 Jun 2007 14:57:34 -0000 1.3
-+++ openoffice.org/vcl/inc/settings.hxx 8 Aug 2007 09:48:36 -0000
+--- openoffice.org.orig/vcl/inc/vcl/settings.hxx 4 Jun 2007 14:57:34 -0000 1.3
++++ openoffice.org/vcl/inc/vcl/settings.hxx 8 Aug 2007 09:48:36 -0000
@@ -1019,55 +1019,6 @@
{ return !(*this == rSet); }
};
@@ -1893,14 +1893,14 @@
RCS file: /cvs/gsl/vcl/inc/vcl/sound.hxx,v
retrieving revision 1.2
diff -u -r1.2 sound.hxx
---- openoffice.org.orig/vcl/inc/sound.hxx 11 Apr 2007 18:11:10 -0000 1.2
-+++ openoffice.org/vcl/inc/sound.hxx 8 Aug 2007 09:48:36 -0000
+--- openoffice.org.orig/vcl/inc/vcl/sound.hxx 11 Apr 2007 18:11:10 -0000 1.2
++++ openoffice.org/vcl/inc/vcl/sound.hxx 8 Aug 2007 09:48:36 -0000
@@ -53,14 +53,9 @@
#ifndef _TIME_HXX
#include <tools/time.hxx>
#endif
-#ifndef _SV_SALSTYPE_HXX
--#include <salstype.hxx>
+-#include <vcl/salstype.hxx>
-#endif
class Window;
@@ -1936,11 +1936,11 @@
- Sound( const Sound& rSound );
- Sound& operator=( const Sound& rSound );
-
--#if _SOLAR__PRIVATE
+-//#if 0 // _SOLAR__PRIVATE
-public:
- SAL_DLLPRIVATE void ImplNotify( SoundNotification eNotification, ULONG nError );
--#endif // __PRIVATE
--
+-//#endif // __PRIVATE
+-
public:
- Sound( Window* pWindow = NULL );
- virtual ~Sound();
@@ -1973,7 +1973,7 @@
- const Link& GetNotifyHdl() const { return maNotifyHdl; }
-
static void Beep( SoundType eType = SOUND_DEFAULT, Window* pWindow = NULL );
--
+-
- static void SetSoundPath( const XubString& rSoundPath );
- static const XubString& GetSoundPath();
-
@@ -1989,13 +1989,13 @@
--- openoffice.org.orig/vcl/source/app/salvtables.cxx 24 Jul 2007 10:04:17 -0000 1.8
+++ openoffice.org/vcl/source/app/salvtables.cxx 8 Aug 2007 09:48:45 -0000
@@ -41,7 +41,6 @@
- #include <salvd.hxx>
- #include <salprn.hxx>
- #include <saltimer.hxx>
--#include <salsound.hxx>
- #include <salogl.hxx>
- #include <salimestatus.hxx>
- #include <salsys.hxx>
+ #include <vcl/salvd.hxx>
+ #include <vcl/salprn.hxx>
+ #include <vcl/saltimer.hxx>
+-#include <vcl/salsound.hxx>
+ #include <vcl/salogl.hxx>
+ #include <vcl/salimestatus.hxx>
+ #include <vcl/salsys.hxx>
@@ -61,10 +60,6 @@
{
}
@@ -2165,26 +2165,26 @@
+++ openoffice.org/vcl/source/app/sound.cxx 8 Aug 2007 09:48:46 -0000
@@ -48,9 +48,6 @@
#ifndef _SV_SVSYS_HXX
- #include <svsys.h>
+ #include <vcl/svsys.h>
#endif
-#ifndef _SV_SALSOUND_HXX
--#include <salsound.hxx>
+-#include <vcl/salsound.hxx>
-#endif
#ifndef _SV_SALFRAME_HXX
- #include <salframe.hxx>
+ #include <vcl/salframe.hxx>
#endif
@@ -63,9 +60,6 @@
#ifndef _SV_WINDOW_HXX
- #include <window.hxx>
+ #include <vcl/window.hxx>
#endif
-#ifndef _SV_SALSOUND_HXX
--#include <salsound.hxx>
+-#include <vcl/salsound.hxx>
-#endif
#ifndef _SV_SALBTYPE_HXX
- #include <salbtype.hxx>
+ #include <vcl/salbtype.hxx>
#endif
@@ -76,194 +70,6 @@
- #include <salinst.hxx>
+ #include <vcl/salinst.hxx>
#endif
-
@@ -2453,7 +2453,7 @@
#include <vcl/salinst.hxx>
#endif
-#ifndef _SV_SALSOUND_HXX
--#include <salsound.hxx>
+-#include <vcl/salsound.hxx>
-#endif
#ifndef _SV_SALOGL_HXX
#include <vcl/salogl.hxx>
@@ -2556,7 +2556,7 @@
EXCEPTIONSFILES=\
$(SLO)$/wmadaptor.obj \
-@@ -87,21 +81,6 @@
+@@ -87,22 +81,6 @@
$(SLO)$/salsys.obj
@@ -2565,10 +2565,11 @@
-.ENDIF
-
-.IF "$(ENABLE_PASF)" != ""
--CDEFS+=-DUSE_PASF
+-CDEFS+=-DUSE_PASF -DPA_VER=$(PA_VER)
-SLOFILES+=$(SLO)$/pasfsound.obj
-.IF "$(SYSTEM_SNDFILE)" == "YES"
-CDEFS+=-DSYSTEM_SNDFILE
+-CFLAGS+=$(SNDFILE_CFLAGS)
-.ENDIF
-.IF "$(SYSTEM_PORTAUDIO)" == "YES"
-CDEFS+=-DSYSTEM_PORTAUDIO
@@ -2615,29 +2616,6 @@
- return new X11SalSound();
-}
-
-diff -ru vcl.orig/unx/dummy/dinst.cxx vcl/unx/dummy/dinst.cxx
---- openoffice.org.orig/vcl/unx/dummy/dinst.cxx 2007-08-08 14:51:13.000000000 +0100
-+++ openoffice.org/vcl/unx/dummy/dinst.cxx 2007-08-08 14:51:27.000000000 +0100
-@@ -66,7 +66,6 @@
- virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
- virtual String GetDefaultPrinter();
-
-- virtual SalSound* CreateSalSound();
- virtual SalTimer* CreateSalTimer();
- virtual SalOpenGL* CreateSalOpenGL( SalGraphics* pGraphics );
- virtual SalI18NImeStatus* CreateI18NImeStatus();
-@@ -168,11 +167,6 @@
- return String();
- }
-
--SalSound* DummyInstance::CreateSalSound()
--{
-- return NULL;
--}
--
- SalTimer* DummyInstance::CreateSalTimer()
- {
- return NULL;
Index: inc/galctrl.hxx
===================================================================
RCS file: /cvs/graphics/svx/inc/galctrl.hxx,v
@@ -2709,3 +2687,118 @@
#ifdef GSTREAMER
SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
+diff -ru vcl.orig/unx/headless/svpdummies.cxx vcl/unx/headless/svpdummies.cxx
+--- openoffice.org.orig/vcl/unx/headless/svpdummies.cxx 2007-08-15 11:15:22.000000000 +0100
++++ openoffice.org/vcl/unx/headless/svpdummies.cxx 2007-08-15 11:16:02.000000000 +0100
+@@ -46,44 +46,6 @@
+ void SvpSalOpenGL::StartScene( SalGraphics* ) {}
+ void SvpSalOpenGL::StopScene() {}
+
+-// SalSound
+-SvpSalSound::~SvpSalSound() {}
+-bool SvpSalSound::IsValid() { return true; }
+-bool SvpSalSound::Init( const String&, ULONG& rSoundLen )
+-{
+- rSoundLen = 0;
+- return true;
+-}
+-void SvpSalSound::Play( ULONG, ULONG, bool bLoop )
+-{
+- m_bPlaying = true;
+- m_bLooping = bLoop;
+-}
+-void SvpSalSound::Stop()
+-{
+- m_bPlaying = m_bLooping = false;
+-}
+-void SvpSalSound::Pause()
+-{
+- m_bPaused = true;
+-}
+-void SvpSalSound::Continue()
+-{
+- m_bPaused = false;
+-}
+-bool SvpSalSound::IsLoopMode() const
+-{
+- return m_bLooping;
+-}
+-bool SvpSalSound::IsPlaying() const
+-{
+- return m_bPlaying;
+-}
+-bool SvpSalSound::IsPaused() const
+-{
+- return m_bPaused;
+-}
+-
+ // SalObject
+ SvpSalObject::SvpSalObject()
+ {
+diff -ru vcl.orig/unx/headless/svpdummies.hxx vcl/unx/headless/svpdummies.hxx
+--- openoffice.org.orig/vcl/unx/headless/svpdummies.hxx 2007-08-15 11:15:22.000000000 +0100
++++ openoffice.org/vcl/unx/headless/svpdummies.hxx 2007-08-15 11:16:26.000000000 +0100
+@@ -36,7 +36,6 @@
+ #ifndef _SVP_SVPDUMMIES_HXX
+
+ #include <vcl/salogl.hxx>
+-#include <vcl/salsound.hxx>
+ #include <vcl/salobj.hxx>
+ #include <vcl/sysdata.hxx>
+ #include <vcl/salimestatus.hxx>
+@@ -59,28 +58,6 @@
+ virtual void StopScene();
+ };
+
+-class SvpSalSound : public SalSound
+-{
+- bool m_bPlaying;
+- bool m_bLooping;
+- bool m_bPaused;
+-public:
+- SvpSalSound() : m_bPlaying( false ), m_bLooping( false ), m_bPaused( false ) {}
+- virtual ~SvpSalSound();
+-
+- // overload all pure virtual methods
+- virtual bool IsValid();
+- virtual bool Init( const String& rSoundName,
+- ULONG& rSoundLen );
+- virtual void Play( ULONG nStartTime, ULONG nPlayTime, bool bLoop );
+- virtual void Stop();
+- virtual void Pause();
+- virtual void Continue();
+- virtual bool IsLoopMode() const;
+- virtual bool IsPlaying() const;
+- virtual bool IsPaused() const;
+-};
+-
+ class SvpSalObject : public SalObject
+ {
+ public:
+diff -ru vcl.orig/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.cxx
+--- openoffice.org.orig/vcl/unx/headless/svpinst.cxx 2007-08-15 11:15:22.000000000 +0100
++++ openoffice.org/vcl/unx/headless/svpinst.cxx 2007-08-15 11:16:11.000000000 +0100
+@@ -269,11 +269,6 @@
+ delete pDevice;
+ }
+
+-SalSound* SvpSalInstance::CreateSalSound()
+-{
+- return new SvpSalSound();
+-}
+-
+ SalTimer* SvpSalInstance::CreateSalTimer()
+ {
+ return new SvpSalTimer( this );
+diff -ru vcl.orig/unx/headless/svpinst.hxx vcl/unx/headless/svpinst.hxx
+--- openoffice.org.orig/vcl/unx/headless/svpinst.hxx 2007-08-15 11:15:22.000000000 +0100
++++ openoffice.org/vcl/unx/headless/svpinst.hxx 2007-08-15 11:16:38.000000000 +0100
+@@ -166,8 +166,6 @@
+ virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+ virtual String GetDefaultPrinter();
+
+- // SalSound
+- virtual SalSound* CreateSalSound();
+ // SalTimer
+ virtual SalTimer* CreateSalTimer();
+ // SalOpenGL
--- ooobuild.VBAObjects.patch DELETED ---
--- openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch DELETED ---
--- openoffice.org-2.0.3.rh187919.gtkunderkde.patch DELETED ---
--- openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch DELETED ---
--- openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch DELETED ---
--- openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch DELETED ---
--- openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch DELETED ---
--- openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch DELETED ---
--- openoffice.org-2.2.0.ooo74401.basctl.boost.patch DELETED ---
--- openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch DELETED ---
--- openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch DELETED ---
--- openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch DELETED ---
--- openoffice.org-2.2.0.ooo75329.xdguserdir.patch DELETED ---
--- openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch DELETED ---
--- openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch DELETED ---
--- openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch DELETED ---
--- openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch DELETED ---
--- openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch DELETED ---
--- openoffice.org-2.2.1.ooo78921.sw.embedded.patch DELETED ---
--- openoffice.org.ooo79953.dbusinhibitscreensaver.patch DELETED ---
--- workspace.cmcfixes34.patch DELETED ---
--- workspace.glyphadv.patch DELETED ---
--- workspace.libxslt02.patch DELETED ---
--- workspace.ppc64one.patch DELETED ---
--- workspace.sixtyfour11.patch DELETED ---
--- workspace.thbpp6.patch DELETED ---
More information about the scm-commits
mailing list