ooo-build r14363 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Oct 20 19:15:06 2008
New Revision: 14363
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14363&view=rev

Log:
2008-10-20  Petr Mladek  <pmladek suse cz>

	* patches/dev300/sfx2-shutdownicon-3layer.diff, patches/dev300/apply:
	  fix the GNOME quickstarter to work again (bnc#434778, i#95223)

2008-10-20  Petr Mladek  <pmladek suse cz>

	* patches/src680/sw-field-patch-fix-competing-protection.diff:
	Workaround for the competing protection problem from n#400884;
	ported Florian's fix from ooo-build-2-4-1 branch




Added:
   trunk/patches/dev300/sfx2-shutdownicon-3layer.diff
   trunk/patches/dev300/sw-field-patch-fix-competing-protection.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Oct 20 19:15:06 2008
@@ -528,6 +528,9 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+# fix the GNOME quickstarter to work again
+sfx2-shutdownicon-3layer.diff, bnc#434778, i#95223, pmladek
+
 [ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
@@ -2445,6 +2448,7 @@
 offapi-field-patch.diff, flr, n#248354
 svtools-field-patch.diff, flr, n#248354
 sw-field-patch.diff, flr, n#248354
+sw-field-patch-fix-competing-protection.diff, flr, n#400884
 
 [ NovellOnly ]
 #only enable enhanced field work in Novell OOo by default

Added: trunk/patches/dev300/sfx2-shutdownicon-3layer.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sfx2-shutdownicon-3layer.diff	Mon Oct 20 19:15:06 2008
@@ -0,0 +1,51 @@
+--- sfx2/source/appl/shutdownicon.cxx.old	2008-10-15 20:02:56.000000000 +0200
++++ sfx2/source/appl/shutdownicon.cxx	2008-10-15 21:00:25.000000000 +0200
+@@ -52,6 +52,7 @@
+ #include <com/sun/star/ui/dialogs/ControlActions.hpp>
+ #include <com/sun/star/document/MacroExecMode.hpp>
+ #include <com/sun/star/document/UpdateDocMode.hpp>
++#include <rtl/bootstrap.hxx>
+ #include <sfx2/filedlghelper.hxx>
+ #include <sfx2/fcontnr.hxx>
+ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
+@@ -83,6 +84,8 @@ using namespace ::vos;
+ using namespace ::rtl;
+ using namespace ::sfx2;
+ 
++extern "C" { static void SAL_CALL thisModule() {} }
++
+ class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
+ {
+ public:
+@@ -142,7 +145,7 @@ bool ShutdownIcon::LoadModule( osl::Modu
+ 
+ 	oslGenericFunction pTmpInit = NULL;
+ 	oslGenericFunction pTmpDeInit = NULL;
+-	if ( pPlugin->load( OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
++	if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
+ 	{
+ 		pTmpInit = pPlugin->getFunctionSymbol(
+ 			OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );
+@@ -825,17 +828,19 @@ void ShutdownIcon::SetAutostart( bool bA
+ #else // UNX
+ 		getDotAutostart( true );
+ 
+-		OUString aPath;
+-		::utl::Bootstrap::locateBaseInstallation(aPath);
++		OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) );
++		Bootstrap::expandMacros( aPath );
+ 
+ 		OUString aDesktopFile;
+ 		::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile );
+-		aDesktopFile += OUString( RTL_CONSTASCII_USTRINGPARAM( "/share/xdg/qstart.desktop" ) );
+ 
+ 		OString aDesktopFileUnx = OUStringToOString( aDesktopFile,
+ 													 osl_getThreadTextEncoding() );
+ 		OString aShortcutUnx = OUStringToOString( aShortcut,
+ 												  osl_getThreadTextEncoding() );
++		// call unlink just in case there is a broken link pointing to an older OOo that
++		// is not longer available on the system
++		unlink( aShortcutUnx );
+ 		symlink( aDesktopFileUnx, aShortcutUnx );
+ 
+ 		ShutdownIcon *pIcon = ShutdownIcon::createInstance();

Added: trunk/patches/dev300/sw-field-patch-fix-competing-protection.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-field-patch-fix-competing-protection.diff	Mon Oct 20 19:15:06 2008
@@ -0,0 +1,16 @@
+--- sw/source/filter/ww8/ww8par.cxx.old	2008-10-15 16:33:07.000000000 +0200
++++ sw/source/filter/ww8/ww8par.cxx	2008-10-15 17:55:41.000000000 +0200
+@@ -3503,7 +3503,12 @@ void wwSectionManager::InsertSegments()
+ 
+         bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  bThisAndPreviousAreCompatible): false;
+         bool bInsertPageDesc = !bInsertSection;
+-        bool bProtected = !bUseEnhFields && SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
++        bool bProtected = SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
++	if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) {
++	    // here we have the special case that the whole document is protected, with the execption of this section.
++	    // I want to address this when I do the section rework, so for the moment we disable the overall protection then...
++	    mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
++	}
+ 
+         if (bInsertPageDesc)
+         {