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

[noelpwer svn gnome org]

Author: noelpwer
Date: Mon Jun  9 19:58:47 2008
New Revision: 12839
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12839&view=rev

Log:
2008-06-09  Noel Power  <noel power novell com>

        * patches/dev300/novell-win32-installer-branding.diff: fix windows build
        * patches/dev300/novell-win32-msi-patchability.diff:
        * patches/dev300/cws-scsheetprotection02-windowsfix.diff:



Added:
   trunk/patches/dev300/cws-scsheetprotection02-windowsfix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/novell-win32-installer-branding.diff
   trunk/patches/dev300/novell-win32-msi-patchability.diff

Added: trunk/patches/dev300/cws-scsheetprotection02-windowsfix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cws-scsheetprotection02-windowsfix.diff	Mon Jun  9 19:58:47 2008
@@ -0,0 +1,18 @@
+--- sc/inc/document.hxx	2008-06-09 20:53:24.812500000 +0100
++++ sc/inc/document.hxx.patched	2008-06-09 20:54:37.718750000 +0100
+@@ -36,6 +36,7 @@
+ #include <vcl/timer.hxx>
+ #include <com/sun/star/uno/Reference.hxx>
+ #include <vos/ref.hxx>
++#include "tabprotection.hxx"
+ #include "scdllapi.h"
+ #include "table.hxx"		// FastGetRowHeight (inline)
+ #include "rangelst.hxx"
+@@ -89,7 +90,6 @@ class ScDBData;
+ class ScDetOpData;
+ class ScDetOpList;
+ class ScDocOptions;
+-class ScDocProtection;
+ class ScDocumentPool;
+ class ScDrawLayer;
+ class ScExtDocOptions;

Modified: trunk/patches/dev300/novell-win32-installer-branding.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-installer-branding.diff	(original)
+++ trunk/patches/dev300/novell-win32-installer-branding.diff	Mon Jun  9 19:58:47 2008
@@ -77,9 +77,9 @@
  			RELATIVE_PATHES_IN_DDF 1
              STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 @@ -150,9 +150,9 @@
- 			SETSTATICPATH 1
              NOVERSIONINDIRNAME 1
  			PROGRAMFILESROOT 1
+                        GLOBALFILEGID gid_File_Dl_Cppu
 -            DOWNLOADBANNER urebanner.bmp
 -            DOWNLOADBITMAP urebitmap.bmp
 -            DOWNLOADSETUPICO ooosetup.ico

Modified: trunk/patches/dev300/novell-win32-msi-patchability.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-msi-patchability.diff	(original)
+++ trunk/patches/dev300/novell-win32-msi-patchability.diff	Mon Jun  9 19:58:47 2008
@@ -7185,14 +7185,28 @@
  	$previous_idt_dir = "";	
  	$updatepack = 0;
  	$msitranpath = "";
---- solenv/bin/modules/installer/windows/file.pm
-+++ solenv/bin/modules/installer/windows/file.pm
-@@ -302,11 +302,23 @@
+dummy line to avoid confusing diff-mode
+--- solenv/bin/modules/installer/windows/property.pm
++++ solenv/bin/modules/installer/windows/property.pm
+@@ -293,6 +293,8 @@
+ 	my $productversion = get_productversion_for_property_table();
+ 	my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($allvariables);
+ 
++	$productversion .= '.' . $ENV{'OOO_PATCHLEVEL'} if defined ($ENV{'OOO_PATCHLEVEL'}) && ($productversion =~ /^\d+\.\d+\.\d+$/);
++
+ 	# Updating the values
+ 
+ 	for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
+dummy line to avoid confusing diff-mode
+--- solenv/bin/modules/installer/windows/file.pm	2008-06-07 13:48:58.288441800 +0100
++++ solenv/bin/modules/installer/windows/file.pm	2008-06-07 14:21:19.725941800 +0100
+@@ -441,13 +441,24 @@ sub get_fileversion
  
  	if ( $allvariables->{'USE_FILEVERSION'} )
  	{
 -		if ( ! $allvariables->{'LIBRARYVERSION'} ) { installer::exiter::exit_program("ERROR: USE_FILEVERSION is set, but not LIBRARYVERSION", "get_fileversion"); } 
 -		$fileversion = $allvariables->{'LIBRARYVERSION'} . "\." . $installer::globals::buildid;
+-		if ( $onefile->{'FileVersion'} ) { $fileversion = $onefile->{'FileVersion'}; } # overriding FileVersion in scp
 +		# We want the versions in the File table to be the same
 +		# as those actually inside the VRB for EXEs and DLLs.
 +		if ( $fileref->{'sourcepath'} =~ /\.(exe|dll)$/i )
@@ -7208,22 +7222,12 @@
 +			my $patchlevel = $ENV{'OOO_PATCHLEVEL'} if defined $ENV{'OOO_PATCHLEVEL'};
 +			$fileversion = $installer::globals::buildid . '.' . $packageversion[0] . '.' . ($packageversion[1]*100 + $packageversion[2]) . '.' . $patchlevel;
 +		}
++
  	}
  	
--	if ( $installer::globals::prepare_winpatch ) { $fileversion = ""; } # Windows patches do not allow this version
- 		
+-	if ( $installer::globals::prepare_winpatch ) { $fileversion = ""; } # Windows patches do not allow this version # -> who says so?
+-		
  	return $fileversion;
  }
-dummy line to avoid confusing diff-mode
---- solenv/bin/modules/installer/windows/property.pm
-+++ solenv/bin/modules/installer/windows/property.pm
-@@ -293,6 +293,8 @@
- 	my $productversion = get_productversion_for_property_table();
- 	my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($allvariables);
- 
-+	$productversion .= '.' . $ENV{'OOO_PATCHLEVEL'} if defined ($ENV{'OOO_PATCHLEVEL'}) && ($productversion =~ /^\d+\.\d+\.\d+$/);
-+
- 	# Updating the values
  
- 	for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
 dummy line to avoid confusing diff-mode