rpms/openoffice.org/FC-4 openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16476

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
Log Message:
adjust for 2.0.2

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 objmisc.cxx |   81 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 37 insertions(+), 44 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 11:12:02 -0000	1.1
+++ openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 12:15:11 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -p -r1.78 objmisc.cxx
 --- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
 +++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
-@@ -1054,40 +1054,27 @@ void SfxObjectShell::CheckMacrosOnLoadin
+@@ -1054,37 +1054,23 @@
  		pImp->bMacroDisabled = sal_True;
  		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
  	}
@@ -21,7 +21,7 @@
 -			if ( bHasMacros )
 -			{
 -				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
--				if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
+-				if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
 -					&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
 -				{
 -					WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
@@ -47,7 +47,6 @@
 -	else
 -	{
 -		if ( HasMacrosLib_Impl() )
-+
 +		if ( !bHasMacros )
 +			bHasMacros = HasMacrosLib_Impl();
 +
@@ -55,13 +54,9 @@
  		{
 -			// no signing in alien formats!
  			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
- 			if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
--			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-+				&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
- 			{
- 				WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
- 				aBox.Execute();
-@@ -2250,23 +2237,30 @@ BOOL SfxObjectShell::HasMacrosLib_Impl()
+ 			if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
+ 			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
+@@ -2245,23 +2231,30 @@
          if ( bHasMacros )
          {
              // a library container exists; check if it's empty
@@ -109,4 +104,3 @@
      }
      catch( uno::Exception& )
      {
-