rpms/openoffice.org/F-10 openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch, NONE, 1.1 openoffice.org.spec, 1.1693, 1.1694
Caolan McNamara
caolanm at fedoraproject.org
Tue Nov 18 16:54:08 UTC 2008
- Previous message (by thread): rpms/olpc-utils/OLPC-4 diskspace.patch, NONE, 1.1 olpc-login, NONE, 1.1 olpc-utils-dbus.patch, NONE, 1.1 x11-input.fdi, NONE, 1.1 xorg-dcon.conf, NONE, 1.1 branch, 1.1, 1.2 olpc-utils.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/olpc-utils/OLPC-4 olpc-utils-touchpad.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24337
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
Log Message:
Resolves: ooo#96279 mediawiki proxies problem
openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch:
--- NEW FILE openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch ---
Index: mediawiki/src/com/sun/star/wiki/Helper.java
===================================================================
RCS file: /cvs/sw/swext/mediawiki/src/com/sun/star/wiki/Helper.java,v
retrieving revision 1.20
diff -u -r1.20 Helper.java
--- openoffice.org.orig/swext/mediawiki/src/com/sun/star/wiki/Helper.java 11 Apr 2008 10:09:49 -0000 1.20
+++ openoffice.org/swext/mediawiki/src/com/sun/star/wiki/Helper.java 18 Nov 2008 16:40:47 -0000
@@ -651,7 +651,7 @@
int nProxyType = AnyConverter.toInt( xNameAccess.getByName( "ooInetProxyType" ) );
if ( nProxyType == 0 )
- aHostConfig.setProxy( "", 0 );
+ aHostConfig.setProxyHost(null);
else
{
if ( nProxyType == 1 )
@@ -672,7 +672,11 @@
String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );
String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );
- int nProxyPort = AnyConverter.toInt( xNameAccess.getByName( aProxyPortProp ) );
+ int nProxyPort = 80;
+
+ Object aPortNo = xNameAccess.getByName( aProxyPortProp );
+ if (!AnyConverter.isVoid(aPortNo))
+ nProxyPort = AnyConverter.toInt(aPortNo);
if ( nProxyPort == -1 )
nProxyPort = 80;
Index: mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
===================================================================
RCS file: /cvs/sw/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java,v
retrieving revision 1.26
diff -u -r1.26 WikiEditSettingDialog.java
--- openoffice.org.orig/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java 6 May 2008 15:50:16 -0000 1.26
+++ openoffice.org/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java 18 Nov 2008 16:40:47 -0000
@@ -284,6 +284,7 @@
if ( addMode )
{
// no cleaning of the settings is necessary
+ Settings.getSettings( m_xContext ).removeSettingByUrl( sMainURL );
Settings.getSettings( m_xContext ).addWikiCon( setting );
Settings.getSettings( m_xContext ).storeConfiguration();
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1693
retrieving revision 1.1694
diff -u -r1.1693 -r1.1694
--- openoffice.org.spec 18 Nov 2008 12:16:54 -0000 1.1693
+++ openoffice.org.spec 18 Nov 2008 16:53:37 -0000 1.1694
@@ -130,6 +130,7 @@
Patch57: openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch
Patch58: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
Patch59: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
+Patch60: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1384,6 +1385,7 @@
%patch57 -p1 -b .ooo95908.pyuno.debugging.spew.patch
%patch58 -p1 -b .ooo90072.sw.undo-longtext.patch
%patch59 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
+%patch60 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3756,6 +3758,7 @@
- Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
- Resolves: rhbz#471724 own the share dir too
- Resolves: rhbz#471103 improve font-settings
+- Resolves: ooo#96279 mediawiki proxies problem
* Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
- window manager hatred
- Previous message (by thread): rpms/olpc-utils/OLPC-4 diskspace.patch, NONE, 1.1 olpc-login, NONE, 1.1 olpc-utils-dbus.patch, NONE, 1.1 x11-input.fdi, NONE, 1.1 xorg-dcon.conf, NONE, 1.1 branch, 1.1, 1.2 olpc-utils.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/olpc-utils/OLPC-4 olpc-utils-touchpad.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list