rpms/openoffice.org/devel workspace.fwk103.patch, NONE, 1.1 workspace.mav46.patch, NONE, 1.1 openoffice.org.spec, 1.1827, 1.1828 openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch, 1.1, NONE openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch, 1.1, NONE workspace.jl115.patch, 1.1, NONE

Caolan McNamara caolanm at fedoraproject.org
Tue Feb 24 15:06:46 UTC 2009 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14480

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk103.patch workspace.mav46.patch 
Removed Files:
	openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch 
	openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch 
	workspace.jl115.patch 
Log Message:
update patch statuses

workspace.fwk103.patch:

--- NEW FILE workspace.fwk103.patch ---
Index: source/misc/acceleratorexecute.cxx
===================================================================
RCS file: /cvs/util/svtools/source/misc/acceleratorexecute.cxx,v
retrieving revision 1.14
diff -u -r1.14 acceleratorexecute.cxx
--- openoffice.org.orig/svtools/source/misc/acceleratorexecute.cxx	30 May 2008 07:33:46 -0000	1.14
+++ openoffice.org/svtools/source/misc/acceleratorexecute.cxx	30 Jan 2009 12:25:52 -0000
@@ -450,8 +451,14 @@
         xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
         css::uno::UNO_QUERY_THROW);
 
-    css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
-    css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg    (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg;
+	try
+	{
+    	css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
+	    xAccCfg = css::uno::Reference< css::ui::XAcceleratorConfiguration >(xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
+	}
+    catch(const css::container::NoSuchElementException&)
+        {}
     return xAccCfg;
 }
 

workspace.mav46.patch:

--- NEW FILE workspace.mav46.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/devel/openoffice.org.spec,v
retrieving revision 1.1827
retrieving revision 1.1828
diff -u -r1.1827 -r1.1828
--- openoffice.org.spec	24 Feb 2009 13:02:35 -0000	1.1827
+++ openoffice.org.spec	24 Feb 2009 15:06:15 -0000	1.1828
@@ -98,38 +98,37 @@
 Patch25: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
 Patch26: workspace.tl66.patch
 Patch27: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch28: workspace.jl115.patch
-Patch29: workspace.mhu17.patch
-Patch30: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch31: workspace.gtkmenuimages.patch
-Patch32: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch33: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch34: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch35: workspace.transogl03redux.patch
-Patch36: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch37: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
-Patch38: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch39: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch40: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch41: workspace.cmcfixes54.patch
-Patch42: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch43: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
-Patch44: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
-Patch45: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
-Patch46: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch47: workspace.gfbcrash.patch
-Patch48: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch49: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch50: workspace.ooo31gsl2.patch
-Patch51: workspace.vcl100.patch
-Patch52: workspace.xmergeclean.patch
-Patch53: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch54: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
-Patch55: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch56: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch57: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch58: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
-Patch59: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch28: workspace.mhu17.patch
+Patch29: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch30: workspace.gtkmenuimages.patch
+Patch31: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch32: workspace.mav46.patch
+Patch33: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+Patch34: workspace.transogl03redux.patch
+Patch35: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch36: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch37: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch38: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch39: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch40: workspace.cmcfixes54.patch
+Patch41: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch42: workspace.fwk103.patch
+Patch43: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch44: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
+Patch45: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
+Patch46: workspace.gfbcrash.patch
+Patch47: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch48: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch49: workspace.ooo31gsl2.patch
+Patch50: workspace.vcl100.patch
+Patch51: workspace.xmergeclean.patch
+Patch52: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch53: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+Patch54: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+Patch55: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
+Patch56: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch57: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
+Patch58: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1562,38 +1561,37 @@
 %patch25 -p1 -b .ooo87970.vcl.samenamesubs.patch
 %patch26 -p1 -b .workspace.tl66.patch
 %patch27 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch28 -p1 -b .workspace.jl115.patch
-%patch29 -p1 -b .workspace.mhu17.patch
-%patch30 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch31 -p0 -b .workspace.gtkmenuimages.patch
-%patch32 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch33 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch34 -p1
-%patch35 -p0 -b .workspace.transogl03redux.patch
-%patch36 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch37 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
-%patch38 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch39 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch40 -p1 -b .ooo98137.filter.redeclared-variables.patch
-%patch41 -p1 -b .workspace.cmcfixes54.patch
-%patch42 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch43 -p1 -b .ooo98649.svtools.missingUI.patch
-%patch44 -p1 -b .ooo98885.sw.safeindex.patch
-%patch45 -p1 -b .ooo98909.sfx2.missingplugins.patch
-%patch46 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch47 -p0 -b .workspace.gfbcrash.patch
-%patch48 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch49 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch50 -p0 -b .workspace.ooo31gsl2.patch
-%patch51 -p0 -b .workspace.vcl100.patch
-%patch52 -p0 -b .workspace.xmergeclean.patch
-%patch53 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch54 -p0 -b .ooo99427.sd.ensure-icons-state.patch
-%patch55 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch56 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch57 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch58 -p0 -b .ooo98465.sw.fix-doctables.patch
-%patch59 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch28 -p1 -b .workspace.mhu17.patch
+%patch29 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch30 -p0 -b .workspace.gtkmenuimages.patch
+%patch31 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch32 -p1 -b .workspace.mav46.patch
+%patch33 -p1
+%patch34 -p0 -b .workspace.transogl03redux.patch
+%patch35 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch36 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch37 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch38 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch39 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch40 -p1 -b .workspace.cmcfixes54.patch
+%patch41 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch42 -p1 -b .workspace.fwk103.patch
+%patch43 -p1 -b .ooo98885.sw.safeindex.patch
+%patch44 -p1 -b .ooo98909.sfx2.missingplugins.patch
+%patch45 -p1 -R -b .ooo99050.sw.htmlload.patch
+%patch46 -p0 -b .workspace.gfbcrash.patch
+%patch47 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch48 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch49 -p0 -b .workspace.ooo31gsl2.patch
+%patch50 -p0 -b .workspace.vcl100.patch
+%patch51 -p0 -b .workspace.xmergeclean.patch
+%patch52 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch53 -p0 -b .ooo99427.sd.ensure-icons-state.patch
+%patch54 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
+%patch55 -p0 -b .ooo99529.sw.notrailingnewline.patch
+%patch56 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch57 -p0 -b .ooo98465.sw.fix-doctables.patch
+%patch58 -p1 -b .oooXXXXX.solenv.allowmissing.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4096,6 +4094,7 @@
   with planned.workspace.defaultdoclang.patch to provide a better
   solution to auto-tracking by default the document language from 
   current locale while retaining capability to override by config
+- drop integrated workspace.jl115.patch
 
 * Tue Feb 24 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.3
 - Resolves: rhbz#486958 add openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch


--- openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch DELETED ---


--- openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch DELETED ---


--- workspace.jl115.patch DELETED ---

More information about the scm-commits mailing list