rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch, NONE, 1.1 .cvsignore, 1.170, 1.171 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.6, 1.7 openoffice.org.spec, 1.1531, 1.1532 pseudoworkspace.valgrind1.patch, 1.34, 1.35 sources, 1.295, 1.296
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Jun 11 13:34:13 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13645
Modified Files:
.cvsignore openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
openoffice.org.spec pseudoworkspace.valgrind1.patch sources
Added Files:
openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
Log Message:
bump
openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch:
--- NEW FILE openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch ---
Index: source/ui/dlg/sdtreelb.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/dlg/sdtreelb.cxx,v
retrieving revision 1.29
diff -u -r1.29 sdtreelb.cxx
--- openoffice.org.orig/sd/source/ui/dlg/sdtreelb.cxx 2 Sep 2007 09:27:52 -0000 1.29
+++ openoffice.org/sd/source/ui/dlg/sdtreelb.cxx 11 Jun 2008 11:26:08 -0000
@@ -960,6 +960,7 @@
{
ErrorBox aErrorBox( this, WB_OK, String( SdResId( STR_READ_DATA_ERROR ) ) );
aErrorBox.Execute();
+ mpMedium = 0; //On failure the SfxMedium is invalid
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- .cvsignore 10 Jun 2008 07:48:56 -0000 1.170
+++ .cvsignore 11 Jun 2008 13:33:20 -0000 1.171
@@ -4,4 +4,4 @@
Tigert-templates.tar.gz
unowinreg.dll
bengali.sdf
-DEV300_m18.tar.bz2
+DEV300_m19.tar.bz2
openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:
Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 11 Jun 2008 07:47:59 -0000 1.6
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 11 Jun 2008 13:33:20 -0000 1.7
@@ -30,13 +30,14 @@
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
for arg in $@
-@@ -76,5 +99,7 @@
+@@ -76,6 +99,8 @@
export PATH
# execute binary
--exec "$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+-exec "$sd_prog/unopkg.bin" "$@" \
++"$sd_prog/unopkg.bin" "$@" \
+ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
-
-+"$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+if [ -n "$INSTDIR" ]; then
+ rm -rf $INSTDIR
+fi
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1531
retrieving revision 1.1532
diff -u -r1.1531 -r1.1532
--- openoffice.org.spec 10 Jun 2008 11:01:24 -0000 1.1531
+++ openoffice.org.spec 11 Jun 2008 13:33:20 -0000 1.1532
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 18
+%define ooomilestone 19
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -132,6 +132,7 @@
Patch56: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
Patch57: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
Patch58: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch59: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1267,6 +1268,7 @@
%patch56 -p1 -b .ooo90178.tools.fixmacro.patch
%patch57 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
%patch58 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch59 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3450,6 +3452,10 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Wed Jun 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
+- next version
+- add openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
+
* Mon Jun 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.18-1
- next version
- drop integrated openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pseudoworkspace.valgrind1.patch 19 May 2008 12:05:02 -0000 1.34
+++ pseudoworkspace.valgrind1.patch 11 Jun 2008 13:33:20 -0000 1.35
@@ -18,42 +18,6 @@
aMemStm.Seek( 0 );
switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
-Index: source/svdraw/svdfppt.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/svdraw/svdfppt.cxx,v
-retrieving revision 1.154
-diff -u -r1.154 svdfppt.cxx
---- openoffice.org.orig/svx/source/svdraw/svdfppt.cxx 31 Jul 2007 17:32:32 -0000 1.154
-+++ openoffice.org/svx/source/svdraw/svdfppt.cxx 23 Jan 2008 20:38:04 -0000
-@@ -526,6 +526,11 @@
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-+void PptColorSchemeAtom::Clear()
-+{
-+ memset(&aData[0], 0, 32);
-+}
-+
- Color PptColorSchemeAtom::GetColor( USHORT nNum ) const
- {
- Color aRetval;
-Index: inc/svx/svdfppt.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/inc/svx/svdfppt.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 svdfppt.hxx
---- openoffice.org.orig/svx/inc/svx/svdfppt.hxx 10 May 2007 14:32:05 -0000 1.3
-+++ openoffice.org/svx/inc/svx/svdfppt.hxx 23 Jan 2008 20:39:05 -0000
-@@ -310,6 +310,9 @@
- BYTE aData[32];
-
- public:
-+ PptColorSchemeAtom () { Clear(); }
-+ void Clear();
-+
-
- Color GetColor( USHORT nNum ) const;
-
--- openoffice.org.orig/vcl/source/gdi/virdev.cxx 25 Oct 2007 16:04:52 -0000 1.31
+++ openoffice.org/vcl/source/gdi/virdev.cxx 31 Mar 2008 09:54:45 -0000
@@ -191,7 +191,8 @@ VirtualDevice::VirtualDevice( const Outp
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- sources 10 Jun 2008 07:48:56 -0000 1.295
+++ sources 11 Jun 2008 13:33:20 -0000 1.296
@@ -4,4 +4,4 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-e6bf91116aacb544db0f44e7f138b45b DEV300_m18.tar.bz2
+eae20165d3f974588db7b8d4e7142250 DEV300_m19.tar.bz2
More information about the fedora-extras-commits
mailing list