rpms/openoffice.org/devel workspace.os132.patch, NONE, 1.1 openoffice.org.spec, 1.1973, 1.1974

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.os132.patch 
Log Message:
add workspace.os132.patch to avoid switch html view overwrite horror

workspace.os132.patch:
 docsh2.cxx |   27 ---------------------------
 1 file changed, 27 deletions(-)

--- NEW FILE workspace.os132.patch ---
Index: sw/source/ui/app/docsh2.cxx
===================================================================
--- sw/source/ui/app/docsh2.cxx	(.../tags/DEV300_m50/sw)	(revision 274340)
+++ sw/source/ui/app/docsh2.cxx	(.../cws/os132/sw)	(revision 274340)
@@ -918,33 +918,6 @@
 						if(!pBool || !pBool->GetValue())
                             break;
 					}
-					else
-                    {
-                        // try to store the document
-                        sal_uInt32 nErrorCode = ERRCODE_NONE;
-                        try
-                        {
-                            uno::Reference< frame::XStorable > xStorable( GetModel(), uno::UNO_QUERY_THROW );
-                            xStorable->store();
-                        }
-                        catch( task::ErrorCodeIOException& aErrEx )
-                        {
-                            nErrorCode = (sal_uInt32)aErrEx.ErrCode;
-                        }
-                        catch( uno::Exception& )
-                        {
-                            nErrorCode = ERRCODE_IO_GENERAL;
-                        }
-
-                        if ( nErrorCode != ERRCODE_NONE )
-                        {
-                            // if the saving has failed show the error and break the action
-                            if ( nErrorCode != ERRCODE_ABORT )
-                                ErrorHandler::HandleError( nErrorCode );
-
-                            break;
-                        }
-                    }
 				}
 #ifdef DBG_UTIL
 				{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1973
retrieving revision 1.1974
diff -u -p -r1.1973 -r1.1974
--- openoffice.org.spec	24 Jul 2009 10:47:13 -0000	1.1973
+++ openoffice.org.spec	25 Jul 2009 15:26:06 -0000	1.1974
@@ -151,6 +151,7 @@ Patch73: workspace.cmcfixes60.patch
 Patch74: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
 Patch75: workspace.vcl103.patch
 Patch76: workspace.cmcfixes61.patch
+Patch77: workspace.os132.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1687,6 +1688,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch74 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
 %patch75 -p0 -b .workspace.vcl103.patch
 %patch76 -p0 -b .workspace.cmcfixes61.patch
+%patch77 -p0 -b .workspace.os132.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4196,8 +4198,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Jul 24 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-16.2
+* Sat Jul 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-16.2
 - make autocorrect and font subpackages noarch
+- add workspace.os132.patch to avoid switch html view overwrite horror
 
 * Wed Jul 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-16.1
 - next milestone