openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546803 [8/14] - in /openoffice/branches/l10n40: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ main/accessibility/source/helper/ main/accessibilit...
Date Sun, 01 Dec 2013 11:40:35 GMT
Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/converter.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/converter.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/converter.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/converter.pm Sun Dec  1 11:40:24 2013
@@ -305,18 +305,17 @@ sub make_path_conform
 
 sub copy_collector
 {
-	my ( $oldcollector ) = @_;
+	my ($oldcollector) = @_;
 
 	my @newcollector = ();
 
-	for ( my $i = 0; $i <= $#{$oldcollector}; $i++ )
+	foreach my $oldhash (@$oldcollector)
 	{
 		my %newhash = ();
-		my $key;
 	
-		foreach $key (keys %{${$oldcollector}[$i]})
+		while (my ($key, $value) = each %$oldhash)
 		{
-			$newhash{$key} = ${$oldcollector}[$i]->{$key};
+			$newhash{$key} = $value;
 		}
 				
 		push(@newcollector, \%newhash);

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/globals.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/globals.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/globals.pm Sun Dec  1 11:40:24 2013
@@ -263,7 +263,6 @@ BEGIN
 	$isopensourceproduct = 1;
 	$manufacturer = "";
 	$longmanufacturer = "";
-	$sundirname = "Oracle";
 	$codefilename = "codes.txt";
 	$componentfilename = "components.txt";	
 	$productcode = "";
@@ -364,7 +363,6 @@ BEGIN
 	@pcfdiffcomment = ();
 	@epmdifflist = ();
 	$desktoplinkexists = 0;
-	$sundirexists = 0;
 	$analyze_spellcheckerlanguage = 0;
 	%spellcheckerlanguagehash = ();
 	%spellcheckerfilehash = ();
@@ -392,11 +390,8 @@ BEGIN
 	$officedirhostname = "";
 	$basisdirhostname = "";
 	$uredirhostname = "";
-	$sundirhostname = "";
 	$officedirgid = "";
 	$basisdirgid = "";
-	$uredirgid = "";
-	$sundirgid = "";
 	
 	%sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
 	%treestyles = ();

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/logger.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/logger.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/logger.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/logger.pm Sun Dec  1 11:40:24 2013
@@ -89,6 +89,40 @@ our $Info = installer::logger->new("info
     'is_show_log_id' => 0
     );
 
+
+
+=head2 SetupSimpleLogging ($filename)
+
+    Setup logging so that $Global, $Lang and $Info all print to the console AND to the log file.
+    
+=cut
+sub SetupSimpleLogging ($)
+{
+    my ($log_filename) = @_;
+
+    $Info = installer::logger->new("info",
+        'is_print_to_console' => 1,
+        'is_show_relative_time' => 1,
+        );
+    $Global = installer::logger->new("glob",
+        'is_print_to_console' => 0,
+        'is_show_relative_time' => 1,
+        'forward' => [$Info]
+        );
+    $Lang = installer::logger->new("lang",
+        'is_print_to_console' => 0,
+        'is_show_relative_time' => 1,
+        'forward' => [$Info]
+        );
+    $Info->set_filename($log_filename);
+    $Info->{'is_print_to_console'} = 1;
+    $installer::globals::quiet = 0;
+    starttime();
+}
+
+
+
+
 =head2 new($class, $id, @arguments)
 
     Create a new instance of the logger class.
@@ -119,7 +153,9 @@ sub new ($$@)
         # Show log id (mostly for debugging the logger)
         'is_show_log_id' => 0,
         # Show the process id, useful on the console when doing a multiprocessor build.
-        'is_show_process_id' => 0
+        'is_show_process_id' => 0,
+        # Current indentation
+        'indentation' => "",
     };
     while (scalar @arguments >= 2)
     {
@@ -219,6 +255,7 @@ sub process_line ($$$$$$)
     {
         $line .= $pid . " : ";
     }
+    $line .= $self->{'indentation'};
     $line .= $message;
 
     # Print the line to a file or to the console or store it for later use.
@@ -359,6 +396,24 @@ sub set_forward ($$)
 
 
 
+sub increase_indentation ($)
+{
+    my ($self) = @_;
+    $self->{'indentation'} .= "    ";
+}
+
+
+
+
+sub decrease_indentation ($)
+{
+    my ($self) = @_;
+    $self->{'indentation'} = substr($self->{'indentation'}, 4);
+}
+
+
+
+
 ####################################################
 # Including header files into the logfile
 ####################################################
@@ -637,6 +692,9 @@ sub print_error
 {
     my $message = shift;
     chomp $message;
+
+    PrintError($message);
+
     print STDERR "\n";
     print STDERR "**************************************************\n";
     print STDERR "ERROR: $message";
@@ -646,6 +704,18 @@ sub print_error
 }
 
 
+
+
+sub PrintError ($@)
+{
+    my ($format, @arguments) = @_;
+
+    $Info->printf("Error: ".$format, @arguments);
+}
+
+
+
+
 =head2 PrintStackTrace()
     This is for debugging the print and printf methods of the logger class and their use.
     Therefore we use the Perl print/printf directly and not the logger methods to avoid loops in case of errors.

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/pathanalyzer.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/pathanalyzer.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/pathanalyzer.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/pathanalyzer.pm Sun Dec  1 11:40:24 2013
@@ -46,6 +46,14 @@ sub get_path_from_fullqualifiedname
 	}	
 }
 
+
+
+
+=head2
+
+    Despite its name, this function seems just to return the basename of the given filename.
+    
+=cut
 sub make_absolute_filename_to_relative_filename
 {
 	my ($longfilenameref) = @_;

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/scppatchsoname.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/scppatchsoname.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/scppatchsoname.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/scppatchsoname.pm Sun Dec  1 11:40:24 2013
@@ -100,31 +100,10 @@ sub replace_productname_in_file
 
 	change_length_of_string(\$unicode_productname, $replacestring);
 
-	my $found1 = $onefile =~ s/$replacestring/$unicode_productname/sg;
-
-	my $found2 = 0;
-
-	if ( $styles =~ /\bPATCH_SO_NAME_Z\b/ )
-	{
-		# searching for "z" 
-
-		$onestring = "z" . chr(0);
-		$replacestring = "";
-		for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
-
-		my $productname2 = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
-		if ( exists($onefilehash->{'FileDescriptionZ'}) ) { $productname2 = $onefilehash->{'FileDescriptionZ'}; }
-		my $unicode_productname2 = convert_to_unicode($productname2);
-
-		change_length_of_string_with_letter(\$unicode_productname2, $replacestring, $onestring);
-
-		$found2 = $onefile =~ s/$replacestring/$unicode_productname2/sg;
-	}
+	my $found = $onefile =~ s/$replacestring/$unicode_productname/sg;
 
 	installer::files::save_binary_file($onefile, $destpath);
 
-	my $found = $found1 + $found2;
-	
 	return $found;
 }
 

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/scpzipfiles.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/scpzipfiles.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/scpzipfiles.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/scpzipfiles.pm Sun Dec  1 11:40:24 2013
@@ -29,29 +29,35 @@ use installer::logger;
 use installer::pathanalyzer;
 use installer::systemactions;
 
+use strict;
+
 ########################################################################################
 # Replacing all zip list variables in setup script and files with flag scpzip_replace
 ########################################################################################
 
-sub replace_all_ziplistvariables_in_file
+sub replace_all_ziplistvariables_in_file ($$)
 {
-	my ( $fileref, $variableshashref ) = @_;
+	my ($lines, $variables) = @_;
 
-	for ( my $i = 0; $i <= $#{$fileref}; $i++ )
+    my $count = scalar @$lines;
+	for (my $lineno=0; $lineno<$count; ++$lineno)
 	{
-		my $line = ${$fileref}[$i];
-
-		if ( $line =~ /^.*\$\{\w+\}.*$/ )	# only occurence of ${abc}
-		{			
-			my $key;
-
-			foreach $key (keys %{$variableshashref})
-			{
-				my $value = $variableshashref->{$key};
-				$key = '${' . $key . '}';
-				$line =~ s/\Q$key\E/$value/g;			
-				${$fileref}[$i] = $line;
+        my $line = $lines->[$lineno];
+		if ($line =~ /\$\{/)  # early rejection of lines that don't need replacements
+		{
+            while (my ($key,$value) = each %$variables)
+			{
+				my $pattern = '${' . $key . '}';
+				my $replacement_count = ($line =~ s/\Q$pattern\E/$value/g);
+                if ($key eq "PRODUCTADDON" && $replacement_count>0)
+                {
+                    $installer::logger::Lang->printf(
+                        "replaced PRODUCTADDON %d times in line %d\n",
+                        $replacement_count,
+                        $lineno);
+                }
 			}
+            $lines->[$lineno] = $line;
 		}
 	}
 }
@@ -61,39 +67,26 @@ sub replace_all_ziplistvariables_in_file
 # the brackets are masked.
 ########################################################################################
 
-sub replace_all_ziplistvariables_in_rtffile
+sub replace_all_ziplistvariables_in_rtffile ($$)
 {
-	my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
-
-	# installer::files::save_file($loggingdir . "license_" . $onelanguage . "_before.rtf", $fileref);
+	my ($lines, $variables) = @_;
 
-	for ( my $i = 0; $i <= $#{$fileref}; $i++ )
+    my $line_count = scalar @$lines;
+	for (my $i=0; $i<=$line_count; ++$i)
 	{
-		my $line = ${$fileref}[$i];
+		my $line = $lines->[$i];
 
-		if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ )	# only occurence of $\{abc\}
-		{			
-			for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
+		if ($line =~ /\$\\\{/) # early rejection of lines without variable references
+		{
+            while (my ($key, $value) = each (%$variables))
 			{
-				my $variableline = ${$variablesref}[$j];
-				
-				my ($key, $value);
-				
-				if ( $variableline =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-				{
-					$key = $1;
-					$value = $2;
-					$key = '$\{' . $key . '\}';
-				}
-				
+                my $pattern = '$\{' . $key . '\}';
 				$line =~ s/\Q$key\E/$value/g;
 
-				${$fileref}[$i] = $line;
 			}
+            $lines->[$i] = $line;
 		}
 	}
-
-	# installer::files::save_file($loggingdir . "license_" . $onelanguage . "_after.rtf", $fileref);
 }
 
 #########################################################

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/scriptitems.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/scriptitems.pm Sun Dec  1 11:40:24 2013
@@ -37,6 +37,8 @@ use File::Spec;
 use SvnRevision;
 use ExtensionsLst;
 
+use strict;
+
 ################################################################
 # Resolving the GID for the directories defined in setup script
 ################################################################
@@ -45,8 +47,6 @@ sub resolve_all_directory_names
 {
 	my ($directoryarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolve_all_directory_names : $#{$directoryarrayref}"); }
-
 	# After this procedure the hash shall contain the complete language 
 	# dependent path, not only the language dependent HostName.
 
@@ -160,8 +160,6 @@ sub remove_delete_only_files_from_produc
 {
 	my ($productarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_delete_only_files_from_productlists : $#{$productarrayref}"); }
-
 	my @newitems = ();
 
 	for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
@@ -189,8 +187,6 @@ sub remove_notinsuite_files_from_product
 {
 	my ($productarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists : $#{$productarrayref}"); }
-
 	my @newitems = ();
 
 	for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
@@ -223,8 +219,6 @@ sub remove_office_start_language_files
 {
 	my ($productarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists : $#{$productarrayref}"); }
-
 	my @newitems = ();
 
 	for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
@@ -257,8 +251,6 @@ sub remove_uninstall_regitems_from_scrip
 {
 	my ($registryarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script : $#{$registryarrayref}"); }
-
 	my @newitems = ();
 
 	for ( my $i = 0; $i <= $#{$registryarrayref}; $i++ )
@@ -310,8 +302,6 @@ sub resolving_all_languages_in_productli
 {
 	my ($productarrayref, $languagesarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolving_all_languages_in_productlists : $#{$productarrayref} : $#{$languagesarrayref}"); }
-
 	my @itemsinalllanguages = ();
 
 	my ($key, $value);
@@ -715,12 +705,6 @@ sub set_global_directory_hostnames
 			$installer::globals::officedirgid = $onedir->{'gid'};
 			$allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname;
 		}
-		if ( $styles =~ /\bSUNDIRECTORY\b/ )
-		{
-			$installer::globals::sundirhostname = $onedir->{'HostName'};
-			$installer::globals::sundirgid = $onedir->{'gid'};
-			$allvariables->{'SUNDIRECTORYHOSTNAME'} = $installer::globals::sundirhostname;
-		}
 	}	
 }
 
@@ -900,8 +884,6 @@ sub changing_name_of_language_dependent_
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::changing_name_of_language_dependent_keys : $#{$itemsarrayref}"); }
-
 	# Changing key for multilingual items from "Name ( )" to "Name" or "HostName ( )" to "HostName"
 
 	for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
@@ -968,8 +950,6 @@ sub replace_setup_variables
 {
 	my ($itemsarrayref, $languagestringref, $hashref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::replace_setup_variables : $#{$itemsarrayref} : $$languagestringref : $hashref->{'PRODUCTNAME'}"); }
-
 	my $languagesstring = $$languagestringref;
 	$languagesstring =~ s/\_/ /g;	# replacing underscore with whitespace
 	# $languagesstring is "01 49" instead of "en-US de"
@@ -1033,19 +1013,24 @@ sub replace_setup_variables
 # the standard destination of user directory defined in scp2 ($SYSUSERCONFIG).
 ################################################################################
 
-sub replace_userdir_variable
+sub replace_userdir_variable ($$)
 {
-	my ($itemsarrayref) = @_;
+	my ($itemsarrayref, $allvariableshashref) = @_;
 	
 	my $userdir = "";
-	if ( $allvariableshashref->{'LOCALUSERDIR'} ) { $userdir = $allvariableshashref->{'LOCALUSERDIR'}; }
-	else { $userdir = $installer::globals::simpledefaultuserdir; } 
+	if ($allvariableshashref->{'LOCALUSERDIR'})
+    {
+        $userdir = $allvariableshashref->{'LOCALUSERDIR'};
+    }
+	else
+    {
+        $userdir = $installer::globals::simpledefaultuserdir;
+    }
 	
-	if ( $userdir ne "" )
+	if ($userdir ne "")
 	{
-		for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
+		foreach my $oneitem (@$itemsarrayref)
 		{
-			my $oneitem = ${$itemsarrayref}[$i];		
 			$oneitem->{'Value'} =~ s/\$SYSUSERCONFIG/$userdir/;
 		}
 	}
@@ -1062,8 +1047,6 @@ sub remove_non_existent_languages_in_pro
 {
 	my ($itemsarrayref, $languagestringref, $searchkey, $itemtype) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_non_existent_languages_in_productlists : $#{$itemsarrayref} : $$languagestringref : $searchkey : $itemtype"); }
-
 	# Removing of all non existent files, for instance asian fonts
 
 	installer::logger::include_header_into_logfile("Removing for this language $$languagestringref:");
@@ -1111,8 +1094,6 @@ sub get_Directoryname_From_Directorygid
 {
 	my ($dirsarrayref ,$searchgid, $onelanguage, $oneitemgid) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Directoryname_From_Directorygid : $#{$dirsarrayref} : $searchgid : $onelanguage"); }
-
 	my $directoryname = "";
 	my $onedirectory;
 	my $foundgid = 0;
@@ -1164,8 +1145,6 @@ sub get_Destination_Directory_For_Item_F
 {
 	my ($itemarrayref, $dirsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist : $#{$itemarrayref} : $#{$dirsarrayref}"); }
-
 	for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
 	{
 		my $oneitem = ${$itemarrayref}[$i];
@@ -1227,8 +1206,6 @@ sub get_sourcepath_from_filename_and_inc
 {
 	my ($searchfilenameref, $includepatharrayref, $write_logfile) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic : $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
-
 	my ($onefile, $includepath, $infoline);
 
 	my $foundsourcefile = 0;
@@ -1285,8 +1262,6 @@ sub get_sourcepath_from_filename_and_inc
 {
 	my ($searchfilenameref, $unused, $write_logfile) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath : $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
-
 	my ($onefile, $includepath, $infoline);
 
 	my $foundsourcefile = 0;
@@ -1397,8 +1372,6 @@ sub get_Source_Directory_For_Files_From_
 {
 	my ($filesarrayref, $includepatharrayref, $dirsref, $item) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist : $#{$filesarrayref} : $#{$includepatharrayref} : $item"); }
-
 	installer::logger::include_header_into_logfile("$item:");
 
 	my $infoline = "";
@@ -1493,8 +1466,6 @@ sub remove_Files_For_Languagepacks
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks : $#{$filesarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -1529,8 +1500,6 @@ sub remove_Files_Without_Sourcedirectory
 {
 	my ($filesarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory : $#{$filesarrayref}"); }
-
 	my $infoline;
 	
 	my $error_occured = 0;
@@ -1641,8 +1610,6 @@ sub add_License_Files_into_Installdir
 {
 	my ($filesarrayref, $dirsarrayref, $languagesarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_License_Files_into_Installdir : $#{$filesarrayref} : $#{$languagesarrayref}"); }
-
 	my $infoline;
 	
 	my @newfilesarray = ();
@@ -1914,8 +1881,6 @@ sub remove_scpactions_without_name
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name : $#{$itemsarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -1950,8 +1915,6 @@ sub change_keys_of_scpactions
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions : $#{$itemsarrayref}"); }
-
 	for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
 	{
 		my $oneitem = ${$itemsarrayref}[$i];
@@ -1995,8 +1958,6 @@ sub remove_Xpdonly_Items
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items : $#{$itemsarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -2033,8 +1994,6 @@ sub remove_Languagepacklibraries_from_In
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset : $#{$itemsarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -2071,8 +2030,6 @@ sub remove_patchonlyfiles_from_Installse
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -2109,8 +2066,6 @@ sub remove_tabonlyfiles_from_Installset
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -2147,8 +2102,6 @@ sub remove_installedproductonlyfiles_fro
 {
 	my ($itemsarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
 	my $infoline;
 	
 	my @newitemsarray = ();
@@ -2184,8 +2137,6 @@ sub quoting_illegal_filenames
 {
 	my ($filesarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames : $#{$filesarrayref}"); }
-	
 	# This function has to be removed as soon as possible!
 	
 	installer::logger::include_header_into_logfile("Renaming illegal filenames:");
@@ -2249,8 +2200,6 @@ sub collect_directories_from_filesarray
 {
 	my ($filesarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray : $#{$filesarrayref}"); }
-
 	my @alldirectories = ();
 	my %alldirectoryhash = ();
 
@@ -2355,12 +2304,10 @@ sub collect_directories_from_filesarray
 # Collecting directories: Part 2
 ##################################
 
-sub collect_directories_with_create_flag_from_directoryarray
+sub collect_directories_with_create_flag_from_directoryarray ($$)
 {
 	my ($directoryarrayref, $alldirectoryhash) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::collect_directories_with_create_flag_from_directoryarray : $#{$directoryarrayref}"); }
-
 	my $alreadyincluded = 0;
 	my @alldirectories = ();
 
@@ -2368,7 +2315,7 @@ sub collect_directories_with_create_flag
 	{
 		my $onedir = ${$directoryarrayref}[$i];
 		my $styles = "";
-		$newdirincluded = 0;
+		my $newdirincluded = 0;
 		
 		if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
 	
@@ -2473,19 +2420,17 @@ sub collect_directories_with_create_flag
 		push(@alldirectories, $alldirectoryhash->{$destdir});
 	}
 
-	return (\@alldirectories, \%alldirectoryhash);	
+	return (\@alldirectories, $alldirectoryhash);	
 }
 
 #################################################
 # Determining the destination file of a link
 #################################################
 
-sub get_destination_file_path_for_links
+sub get_destination_file_path_for_links ($$)
 {
 	my ($linksarrayref, $filesarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_destination_file_path_for_links : $#{$linksarrayref} : $#{$filesarrayref}"); }
-
 	my $infoline;
 
 	for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
@@ -2527,30 +2472,27 @@ sub get_destination_file_path_for_links
 # Determining the destination link of a link
 #################################################
 
-sub get_destination_link_path_for_links
+sub get_destination_link_path_for_links ($)
 {
 	my ($linksarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_destination_link_path_for_links : $#{$linksarrayref}"); }
-
 	my $infoline;
 
-	for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
+	foreach my $onelink (@$linksarrayref)
 	{
 		my $shortcutid = "";
-		my $onelink = ${$linksarrayref}[$i];
-		if ( $onelink->{'ShortcutID'} ) { $shortcutid = $onelink->{'ShortcutID'}; }
+		if ($onelink->{'ShortcutID'})
+        {
+            $shortcutid = $onelink->{'ShortcutID'};
+        }
 
-		if (!( $shortcutid eq "" ))
+		if ($shortcutid ne "")
 		{
 			my $foundlink = 0;
 
-			for ( my $j = 0; $j <= $#{$linksarrayref}; $j++ )
+			foreach my $destlink (@$linksarrayref)
 			{
-				my $destlink = ${$linksarrayref}[$j];
-				$shortcutgid = $destlink->{'gid'};
-				
-				if ( $shortcutgid eq $shortcutid )
+				if ($destlink->{'gid'} eq $shortcutid)
 				{
 					$foundlink = 1;
 					$onelink->{'destinationfile'} = $destlink->{'destination'};		# making key 'destinationfile'
@@ -2558,7 +2500,7 @@ sub get_destination_link_path_for_links
 				}				
 			}
 			
-			if (!($foundlink))
+			if ( ! $foundlink)
 			{
                 $installer::logger::Lang->printf("Warning: ShortcutID %s for Link %s not found!\n",
                     $shortcutid,
@@ -2578,8 +2520,6 @@ sub remove_workstation_only_items
 {
 	my ($itemarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items : $#{$itemarrayref}"); }
-	
 	my @newitemarray = ();
 	
 	for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
@@ -2608,8 +2548,6 @@ sub resolve_links_with_flag_relative
 {
 	my ($linksarrayref) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolve_links_with_flag_relative : $#{$linksarrayref}"); }
-
 	# Before this step is:
 	# destination=program/libsalhelperC52.so.3, this will be the name of the link
 	# destinationfile=program/libsalhelperC52.so.3, this will be the linked file or name
@@ -2671,7 +2609,7 @@ sub insert_for_item ($$$)
 	$hash->{$item} = $gid_list;
 }
 
-sub build_modulegids_table
+sub build_modulegids_table ($$)
 {
 	my ($modulesref, $itemname) = @_;
 
@@ -2679,9 +2617,9 @@ sub build_modulegids_table
 
 	# build map of item names to list of respective module gids
 	# containing these items
-	for my $onemodule (@{$modulesref})
+	foreach my $onemodule (@{$modulesref})
 	{
-		next if ( ! defined $onemodule->{$itemname} );
+		next if ! defined $onemodule->{$itemname};
 		# these are the items contained in this module
 		# eg. Files = (gid_a_b_c,gid_d_e_f)
 		my $module_gids = $onemodule->{$itemname};
@@ -2704,38 +2642,46 @@ sub build_modulegids_table
 # This function is a helper of function "assigning_modules_to_items"
 ########################################################################
 
-sub get_string_of_modulegids_for_itemgid
+sub get_string_of_modulegids_for_itemgid ($$)
 {
-	my ($module_lookup_table, $modulesref, $itemgid, $itemname) = @_;
-
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid : $#{$modulesref} : $itemgid : $itemname"); }
+	my ($module_lookup_table, $itemgid) = @_;
 
-	my $allmodules = "";
 	my $haslanguagemodule = 0;
 	my %foundmodules = ();
 
 	# print STDERR "lookup '" . lc($itemgid) . "'\n";
 	my $gid_list = $module_lookup_table->{lc($itemgid)};
 
-	for my $gid (@{$gid_list})
+	foreach my $gid (@{$gid_list})
 	{
 		$foundmodules{$gid} = 1;
-		$allmodules = $allmodules . "," . $gid;
 		# Is this module a language module? This info should be stored at the file.
-		if ( exists($installer::globals::alllangmodules{$gid}) ) { $haslanguagemodule = 1; }
+		if ( exists($installer::globals::alllangmodules{$gid}) )
+        {
+            $haslanguagemodule = 1;
+        }
  	}
 	
-	$allmodules =~ s/^\s*\,//;	# removing leading comma
+	my $allmodules = join(",", keys %foundmodules);
 
 	# Check: All modules or no module must have flag LANGUAGEMODULE
 	if ( $haslanguagemodule )
 	{
-		my $isreallylanguagemodule = installer::worker::key_in_a_is_also_key_in_b(\%foundmodules, \%installer::globals::alllangmodules);
-		if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid");  }
+		my $isreallylanguagemodule = installer::worker::key_in_a_is_also_key_in_b(
+            \%foundmodules,
+            \%installer::globals::alllangmodules);
+		if ( ! $isreallylanguagemodule )
+        {
+            installer::exiter::exit_program(
+                sprintf(
+                    "ERROR: \"\" is assigned to modules with flag "
+                    . "\"LANGUAGEMODULE\" and also to modules without this flag! Modules: %s",
+                    $itemgid,
+                    $allmodules),
+                "get_string_of_modulegids_for_itemgid");
+        }
 	}
 
-	# print STDERR "get_string_for_itemgid ($itemgid, $itemname) => $allmodules, $haslanguagemodule\n";
-
 	return ($allmodules, $haslanguagemodule);
 }
 
@@ -2748,9 +2694,6 @@ sub assigning_modules_to_items
 {
 	my ($modulesref, $itemsref, $itemname) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::assigning_modules_to_items : $#{$modulesref} : $#{$itemsref} : $itemname"); }
-	
-	my $infoline = "";
 	my $languageassignmenterror = 0;
 	my @languageassignmenterrors = ();
 
@@ -2766,34 +2709,48 @@ sub assigning_modules_to_items
 		
 		if ( $itemgid eq "" ) 
 		{
-			installer::exiter::exit_program("ERROR in item collection: No gid for item $oneitem->{'Name'}", "assigning_modules_to_items");
+			installer::exiter::exit_program(
+                sprintf("ERROR in item collection: No gid for item %s", $oneitem->{'Name'}),
+                "assigning_modules_to_items");
 		}
 
 		# every item can belong to many modules
 				
-		my ($modulegids, $haslanguagemodule) = get_string_of_modulegids_for_itemgid($module_lookup_table, $modulesref, $itemgid, $itemname);
+		my ($modulegids, $haslanguagemodule) = get_string_of_modulegids_for_itemgid(
+            $module_lookup_table,
+            $itemgid);
 
 		if ($modulegids eq "")
 		{
-			installer::exiter::exit_program("ERROR in file collection: No module found for $itemname $itemgid", "assigning_modules_to_items");
+			installer::exiter::exit_program(
+                sprintf("ERROR in file collection: No module found for %s %s",
+                    $itemname,
+                    $itemgid),
+                "assigning_modules_to_items");
 		}
 
 		$oneitem->{'modules'} = $modulegids;
 		$oneitem->{'haslanguagemodule'} = $haslanguagemodule;
 		
 		# Important check: "ismultilingual" and "haslanguagemodule" must have the same value !
-		if (( $oneitem->{'ismultilingual'} ) && ( ! $oneitem->{'haslanguagemodule'} ))
+		if ($oneitem->{'ismultilingual'} && ! $oneitem->{'haslanguagemodule'})
 		{
-			$infoline = "Error: \"$oneitem->{'gid'}\" is multi lingual, but not in language pack (Assigned module: $modulegids)!\n";
+			my $infoline = sprintf(
+                "Error: \"%s\" is multi lingual, but not in language pack (Assigned module: %s)\n",
+                $oneitem->{'gid'},
+                $modulegids);
             $installer::logger::Global->print($infoline);
-			push( @languageassignmenterrors, $infoline );
+			push(@languageassignmenterrors, $infoline);
 			$languageassignmenterror = 1;
 		}
-		if (( $oneitem->{'haslanguagemodule'} ) && ( ! $oneitem->{'ismultilingual'} ))
+		elsif ($oneitem->{'haslanguagemodule'} && ! $oneitem->{'ismultilingual'})
 		{
-			$infoline = "Error: \"$oneitem->{'gid'}\" is in language pack, but not multi lingual (Assigned module: $modulegids)!\n";
+			my $infoline = sprintf(
+                "Error: \"%s\" is in language pack, but not multi lingual (Assigned module: %s)\n",
+                $oneitem->{'gid'},
+                $modulegids);
             $installer::logger::Global->print($infoline);
-			push( @languageassignmenterrors, $infoline );
+			push(@languageassignmenterrors, $infoline);
 			$languageassignmenterror = 1;
 		}
 	}
@@ -2814,8 +2771,6 @@ sub add_rootpath_to_directories
 {
 	my ($dirsref, $rootpath) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories : $#{$dirsref} : $rootpath"); }
-
 	for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
 	{
 		my $onedir = ${$dirsref}[$i];
@@ -2845,8 +2800,6 @@ sub add_rootpath_to_files
 {
 	my ($filesref, $rootpath) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files : $#{$filesref} : $rootpath"); }
-	
 	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
 	{
 		my $onefile = ${$filesref}[$i];
@@ -2860,8 +2813,6 @@ sub add_rootpath_to_links
 {
 	my ($linksref, $rootpath) = @_;
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links : $#{$linksref} : $rootpath"); }
-	
 	for ( my $i = 0; $i <= $#{$linksref}; $i++ )
 	{
 		my $onelink = ${$linksref}[$i];
@@ -3132,4 +3083,27 @@ sub filter_layerlinks_from_unixlinks
 	return \@alllinks;
 }
 
+
+
+
+=head2 print_script_item($item)
+
+    For debugging.
+    Print the contents of the given script item to $installer::logger::Lang.
+    
+=cut
+sub print_script_item ($)
+{
+    my ($item) = @_;
+
+    $installer::logger::Lang->printf("script item %s\n", $item->{'uniquename'});
+    foreach my $key (sort keys %$item)
+    {
+        my $value = $item->{$key};
+        $value = "<undef>" unless defined $value;
+        $installer::logger::Lang->printf("    %20s -> %s\n", $key, $value);
+    }
+}
+
+
 1;

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/setupscript.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/setupscript.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/setupscript.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/setupscript.pm Sun Dec  1 11:40:24 2013
@@ -31,6 +31,8 @@ use installer::remover;
 use installer::scriptitems;
 use installer::ziplist;
 
+use strict;
+
 #######################################################
 # Set setup script name, if not defined as parameter
 #######################################################
@@ -74,9 +76,9 @@ sub set_setupscript_name
 # Reading script variables from installation object of script file
 #####################################################################
 
-sub get_all_scriptvariables_from_installation_object
+sub get_all_scriptvariables_from_installation_object ($$)
 {
-	my ($scriptref) = @_;
+	my ($scriptref, $script_filename) = @_;
 	
 	my @installobjectvariables;
 
@@ -521,13 +523,9 @@ sub replace_preset_properties
 	my @presetproperties = ();
 	push(@presetproperties, "SOLARISBRANDPACKAGENAME");
 	push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
-	# push(@presetproperties, "UNIXPACKAGENAME");
-	# push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME");
-	# push(@presetproperties, "UNIXPRODUCTNAME");
-	# push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME");
 	
 
-	foreach $property ( @presetproperties )
+	foreach my $property (@presetproperties)
 	{
 		my $presetproperty = "PRESET" . $property;
 		if (( exists($allvariables->{$presetproperty}) ) && ( $allvariables->{$presetproperty} ne "" ))

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/assembly.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/assembly.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/assembly.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/assembly.pm Sun Dec  1 11:40:24 2013
@@ -28,6 +28,8 @@ use installer::globals;
 use installer::worker;
 use installer::windows::idtglobal;
 
+use strict;
+
 ##############################################################
 # Returning the first module of a file from the
 # comma separated list of modules.
@@ -224,9 +226,9 @@ sub create_msiassembly_table
 # Returning the name for the table MsiAssemblyName
 ####################################################################################
 
-sub get_msiassemblyname_name
+sub get_msiassemblyname_name ($)
 {
-	( $number ) = @_;
+	my ($number) = @_;
 	
 	my $name = "";
 	
@@ -315,12 +317,9 @@ sub add_assembly_condition_into_componen
 	my $componenttablename = $basedir . $installer::globals::separator . "Componen.idt";
 	my $componenttable = installer::files::read_file($componenttablename);
 	my $changed = 0;
-	my $infoline = "";
 
-	for ( my $i = 0; $i <= $#{$installer::globals::msiassemblyfiles}; $i++ )
+	foreach my $onefile (@$installer::globals::msiassemblyfiles)
 	{
-		my $onefile = ${$installer::globals::msiassemblyfiles}[$i];
-		
 		my $filecomponent = get_msiassembly_component($onefile);
 	
 		for ( my $j = 0; $j <= $#{$componenttable}; $j++ )
@@ -342,13 +341,17 @@ sub add_assembly_condition_into_componen
 					
 					# $condition = "MsiNetAssemblySupport";
 					$condition = "DOTNET_SUFFICIENT=1";
-					$oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n";
+					$oneline = join("\t",
+                        $component,
+                        $componentid,
+                        $directory,
+                        $attributes,
+                        $condition,
+                        $keypath) . "\n";
 					${$componenttable}[$j] = $oneline;
 					$changed = 1;
-					$infoline = "Changing $componenttablename :\n"; 
-					$installer::logger::Lang->print($infoline);
-					$infoline = $oneline; 
-					$installer::logger::Lang->print($infoline);
+					$installer::logger::Lang->print("Changing %s :\n", $componenttablename);
+					$installer::logger::Lang->print($oneline);
 					last;			
 				}		
 			}
@@ -359,8 +362,7 @@ sub add_assembly_condition_into_componen
 	{
 		# Saving the file
 		installer::files::save_file($componenttablename ,$componenttable);
-		$infoline = "Saved idt file: $componenttablename\n"; 
-		$installer::logger::Lang->print($infoline);
+		$installer::logger::Lang->print("Saved idt file: %s\n", $componenttablename);
 	}
 }
 

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/component.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/component.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/component.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/component.pm Sun Dec  1 11:40:24 2013
@@ -39,9 +39,9 @@ use installer::windows::language;
 # Sample for a guid: {B68FD953-3CEF-4489-8269-8726848056E8}
 ##############################################################
 
-sub get_component_guid
+sub get_component_guid ($)
 {	
-	my ( $componentname, $componentidhashref ) = @_;
+	my ($componentname) = @_;
 	
 	# At this time only a template
 	my $returnvalue = "\{COMPONENTGUID\}";
@@ -49,6 +49,9 @@ sub get_component_guid
 	# Returning a ComponentID, that is assigned in scp project
 	if ( exists($installer::globals::componentid{$componentname}) )
 	{
+        $installer::logger::Lang->printf("reusing guid %s for component %s\n",
+            $installer::globals::componentid{$componentname},
+            $componentname);
 		$returnvalue = "\{" . $installer::globals::componentid{$componentname} . "\}";
 	}
 	
@@ -59,52 +62,50 @@ sub get_component_guid
 # Returning the directory for a file component.
 ##############################################################
 
-sub get_file_component_directory
+sub get_file_component_directory ($$$)
 {
 	my ($componentname, $filesref, $dirref) = @_; 
 
-	my ($onefile, $component, $onedir, $hostname, $uniquedir);
+	my ($component,  $uniquedir);
 	my $found = 0;
 
-	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+	foreach my $onefile (@$filesref)
 	{
-		$onefile = 	${$filesref}[$i];
-		$component = $onefile->{'componentname'};
-		
-		if ( $component eq $componentname )
+		if ($onefile->{'componentname'} eq $componentname)
 		{
-			$found = 1;
-			last;
-		}	
+            return get_file_component_directory_for_file($onefile, $dirref);
+		}
 	}
 	
-	if (!($found))
-	{
-		# This component can be ignored, if it exists in a version with extension "_pff" (this was renamed in file::get_sequence_for_file() )
-		my $ignore_this_component = 0;
-		my $origcomponentname = $componentname;
-		my $componentname = $componentname . "_pff";
-		
-		for ( my $j = 0; $j <= $#{$filesref}; $j++ )
-		{
-			$onefile = 	${$filesref}[$j];
-			$component = $onefile->{'componentname'};
+
+    # This component can be ignored, if it exists in a version with
+    # extension "_pff" (this was renamed in file::get_sequence_for_file() )
+    my $ignore_this_component = 0;
+    my $origcomponentname = $componentname;
+    my $componentname_pff = $componentname . "_pff";
 		
-			if ( $component eq $componentname )
-			{
-				$ignore_this_component = 1;
-				last;
-			}	
-		}
+    foreach my $onefile (@$filesref)
+    {
+        if ($onefile->{'componentname'} eq $componentname_pff)
+        {
+            return "IGNORE_COMP";
+        }	
+    }
 		
-		if ( $ignore_this_component ) { return "IGNORE_COMP"; }
-		else { installer::exiter::exit_program("ERROR: Did not find component \"$origcomponentname\" in file collection", "get_file_component_directory"); }
-	}
+    installer::exiter::exit_program(
+        "ERROR: Did not find component \"$origcomponentname\" in file collection",
+        "get_file_component_directory");
+}
+
 
-	my $localstyles = "";
-	
-	if ( $onefile->{'Styles'} ) { $localstyles = $onefile->{'Styles'}; }
 
+
+sub get_file_component_directory_for_file ($$)
+{
+    my ($onefile, $dirref) = @_;
+
+	my $localstyles = $onefile->{'Styles'} // "";
+	
 	if ( $localstyles =~ /\bFONT\b/ )	# special handling for font files
 	{
 		return $installer::globals::fontsfolder;
@@ -126,7 +127,8 @@ sub get_file_component_directory
 	$destination =~ s/\Q$installer::globals::separator\E\s*$//;
 	
 	# This path has to be defined in the directory collection at "HostName" 
-	
+
+    my $uniquedir = undef;
 	if ($destination eq "")		# files in the installation root
 	{
 		$uniquedir = "INSTALLLOCATION";
@@ -135,24 +137,23 @@ sub get_file_component_directory
 	{
 		$found = 0;
 	
-		for ( my $i = 0; $i <= $#{$dirref}; $i++ )
+		foreach my $directory (@$dirref)
 		{
-			$onedir = 	${$dirref}[$i];
-			$hostname = $onedir->{'HostName'};
-		
-			if ( $hostname eq $destination )
+			if ($directory->{'HostName'} eq $destination )
 			{
 				$found = 1;
+                $uniquedir = $directory->{'uniquename'};
 				last;
 			}	
 		}
 
-		if (!($found))
+		if ( ! $found)
 		{
-			installer::exiter::exit_program("ERROR: Did not find destination $destination in directory collection", "get_file_component_directory");
+			installer::exiter::exit_program(
+                "ERROR: Did not find destination $destination in directory collection",
+                "get_file_component_directory");
 		}
 	
-		$uniquedir = $onedir->{'uniquename'};
 		
 		if ( $uniquedir eq $installer::globals::officeinstalldirectory )
 		{
@@ -226,7 +227,8 @@ sub get_file_component_attributes
 		$attributes = 0;	# Assembly files cannot run from source
 	}
 		
-	if (( $onefile->{'Dir'} =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
+	if ((defined $onefile->{'Dir'} && $onefile->{'Dir'} =~ /\bPREDEFINED_OSSHELLNEWDIR\b/)
+        || $onefile->{'needs_user_registry_key'})
 	{
 		$attributes = 4;	# Files in shellnew dir and in non advertised startmenu entries must have user registry key as KeyPath
 	}
@@ -320,54 +322,51 @@ sub get_component_condition
 # real filename!
 ####################################################################
 
-sub get_component_keypath
+sub get_component_keypath ($$)
 {
-	my ($componentname, $itemsref, $componentidkeypathhashref) = @_;
+	my ($componentname, $itemsref) = @_;
 
-	my $oneitem;
 	my $found = 0;
 	my $infoline = "";
 
-	for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
+	foreach my $oneitem (@$itemsref)
 	{
-		$oneitem = 	${$itemsref}[$i];
-		my $component = $oneitem->{'componentname'};
-		
+        my $component = $oneitem->{'componentname'};
+
+		if ( ! defined $component)
+        {
+            installer::scriptitems::print_script_item($oneitem);
+            installer::logger::PrintError("item in get_component_keypath has no 'componentname'\n");
+            return "";
+        }
 		if ( $component eq $componentname )
 		{
-			$found = 1;
-			last;
-		}
-	}
+            my $keypath = $oneitem->{'uniquename'};	# "uniquename", not "Name" 
 	
-	if (!($found))
-	{
-		installer::exiter::exit_program("ERROR: Did not find component in file/registry collection, function get_component_keypath", "get_component_keypath");
-	}
+            # Special handling for components in
+            # PREDEFINED_OSSHELLNEWDIR. These components need as
+            # KeyPath a RegistryItem in HKCU
+            if ($oneitem->{'userregkeypath'})
+            {
+                $keypath = $oneitem->{'userregkeypath'};
+            }
 
-	my $keypath = $oneitem->{'uniquename'};	# "uniquename", not "Name" 
+            # saving it in the file and registry collection
+            $oneitem->{'keypath'} = $keypath;
 	
-	# Special handling for updates from existing databases, because KeyPath must not change
-	if (( $installer::globals::updatedatabase ) && ( exists($componentidkeypathhashref->{$componentname}) ))
-	{
-		$keypath = $componentidkeypathhashref->{$componentname};
-		# -> check, if this is a valid key path?!
-		if ( $keypath ne $oneitem->{'uniquename'} )
+            return $keypath
+		}
+
+		if ($oneitem->{'componentname'} eq $componentname)
 		{
-			# Warning: This keypath was changed because of info from old database
-			$infoline = "WARNING: The KeyPath for component \"$componentname\" was changed from \"$oneitem->{'uniquename'}\" to \"$keypath\" because of information from update database";
-			$installer::logger::Lang->print($infoline);
+			$found = 1;
+			last;
 		}
 	}
-	
-	# Special handling for components in PREDEFINED_OSSHELLNEWDIR. These components
-	# need as KeyPath a RegistryItem in HKCU
-	if ( $oneitem->{'userregkeypath'} ) { $keypath = $oneitem->{'userregkeypath'}; }
 
-	# saving it in the file and registry collection
-	$oneitem->{'keypath'} = $keypath;
-	
-	return $keypath
+    installer::exiter::exit_program(
+        "ERROR: Did not find component in file/registry collection, function get_component_keypath",
+        "get_component_keypath");
 }
 
 ###################################################################
@@ -376,9 +375,16 @@ sub get_component_keypath
 # Component ComponentId Directory_ Attributes Condition KeyPath
 ###################################################################
 
-sub	create_component_table
+sub	create_component_table ($$$$$$$)
 {
-	my ($filesref, $registryref, $dirref, $allfilecomponentsref, $allregistrycomponents, $basedir, $componentidhashref, $componentidkeypathhashref, $allvariables) = @_;
+	my ($filesref,
+        $registryref,
+        $dirref,
+        $allfilecomponentsref,
+        $allregistrycomponents,
+        $basedir,
+        $allvariables)
+        = @_;
 
 	my @componenttable = ();
 
@@ -396,12 +402,12 @@ sub	create_component_table
 		my %onecomponent = ();
 		
 		$onecomponent{'name'} = ${$allfilecomponentsref}[$i]; 
-		$onecomponent{'guid'} = get_component_guid($onecomponent{'name'}, $componentidhashref); 
+		$onecomponent{'guid'} = get_component_guid($onecomponent{'name'}); 
 		$onecomponent{'directory'} = get_file_component_directory($onecomponent{'name'}, $filesref, $dirref);
 		if ( $onecomponent{'directory'} eq "IGNORE_COMP" ) { next; }
 		$onecomponent{'attributes'} = get_file_component_attributes($onecomponent{'name'}, $filesref, $allvariables); 
 		$onecomponent{'condition'} = get_file_component_condition($onecomponent{'name'}, $filesref); 
-		$onecomponent{'keypath'} = get_component_keypath($onecomponent{'name'}, $filesref, $componentidkeypathhashref); 
+		$onecomponent{'keypath'} = get_component_keypath($onecomponent{'name'}, $filesref); 
 
 		$oneline = $onecomponent{'name'} . "\t" . $onecomponent{'guid'} . "\t" . $onecomponent{'directory'} . "\t"  
 				. $onecomponent{'attributes'} . "\t" . $onecomponent{'condition'} . "\t" . $onecomponent{'keypath'} . "\n";
@@ -416,11 +422,11 @@ sub	create_component_table
 		my %onecomponent = ();
 		
 		$onecomponent{'name'} = ${$allregistrycomponents}[$i]; 
-		$onecomponent{'guid'} = get_component_guid($onecomponent{'name'}, $componentidhashref); 
+		$onecomponent{'guid'} = get_component_guid($onecomponent{'name'}); 
 		$onecomponent{'directory'} = get_registry_component_directory();
 		$onecomponent{'attributes'} = get_registry_component_attributes($onecomponent{'name'}, $allvariables); 
 		$onecomponent{'condition'} = get_component_condition($onecomponent{'name'}); 
-		$onecomponent{'keypath'} = get_component_keypath($onecomponent{'name'}, $registryref, $componentidkeypathhashref); 
+		$onecomponent{'keypath'} = get_component_keypath($onecomponent{'name'}, $registryref); 
 
 		$oneline = $onecomponent{'name'} . "\t" . $onecomponent{'guid'} . "\t" . $onecomponent{'directory'} . "\t"  
 				. $onecomponent{'attributes'} . "\t" . $onecomponent{'condition'} . "\t" . $onecomponent{'keypath'} . "\n";

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/directory.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/directory.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/directory.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/directory.pm Sun Dec  1 11:40:24 2013
@@ -269,7 +269,6 @@ sub create_unique_directorynames
 			if ( $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION alread set: \"$installer::globals::installlocationdirectory\".", "create_unique_directorynames"); }
 			$installer::globals::installlocationdirectory = $uniquename;
 			$installer::globals::installlocationdirectoryset = 1;
-			if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) { $installer::globals::sundirexists = 1; }
 		}
 		
 		# setting the sundirectory
@@ -353,9 +352,9 @@ sub get_last_directory_name
 # Creating the defaultdir for the file Director.idt
 #####################################################
 
-sub create_defaultdir_directorynames
+sub create_defaultdir_directorynames ($)
 {
-	my ($directoryref, $shortdirnamehashref) = @_;
+	my ($directoryref) = @_;
 
 	my @shortnames = ();
 	if ( $installer::globals::prepare_winpatch ) { @shortnames = values(%installer::globals::saved83dirmapping); }
@@ -468,11 +467,6 @@ sub add_root_directories
 			$productkey = $productkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; 
 			$realproductkey = $realproductkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; 
 		}
-		if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} ) 
-		{ 
-			$productkey = $productname; 
-			$realproductkey = $realproductname; 
-		}
 		if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} ) 
 		{
 			$productkey =~ s/\ /\_/g; 
@@ -546,9 +540,9 @@ sub add_root_directories
 # Creating the file Director.idt dynamically
 ###############################################
 
-sub create_directory_table
+sub create_directory_table ($$$$)
 {
-	my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
+	my ($directoryref, $basedir, $allvariableshashref, $loggingdir) = @_;
 
 	# Structure of the directory table:
 	# Directory Directory_Parent DefaultDir
@@ -567,7 +561,7 @@ sub create_directory_table
 	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1.log", $directoryref); }
 	create_unique_directorynames($directoryref, $allvariableshashref);
 	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1a.log", $directoryref); }
-	create_defaultdir_directorynames($directoryref, $shortdirnamehashref);	# only destdir!
+	create_defaultdir_directorynames($directoryref);	# only destdir!
 	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_2.log", $directoryref); }
 	set_installlocation_directory($directoryref, $allvariableshashref);
 	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/file.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/file.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/file.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/file.pm Sun Dec  1 11:40:24 2013
@@ -360,9 +360,9 @@ sub get_component_from_assigned_file
 # In most cases this is simply the filename.
 ####################################################################
 
-sub generate_unique_filename_for_filetable
+sub generate_unique_filename_for_filetable ($$)
 {
-	my ($fileref, $component, $uniquefilenamehashref) = @_;
+	my ($fileref, $component) = @_;
 
 	# This new filename has to be saved into $fileref, because this is needed to find the source.
 	# The filename sbasic.idx/OFFSETS is changed to OFFSETS, but OFFSETS is not unique.
@@ -451,9 +451,9 @@ sub generate_unique_filename_for_filetab
 # The first part has to be 8.3 conform.
 ####################################################################
 
-sub generate_filename_for_filetable
+sub generate_filename_for_filetable ($$)
 {
-	my ($fileref, $shortnamesref, $uniquefilenamehashref) = @_;
+	my ($fileref, $shortnamesref) = @_;
 
 	my $returnstring = "";
 
@@ -659,9 +659,9 @@ sub collect_shortnames_from_old_database
 # Creating the file File.idt dynamically
 ############################################
 
-sub create_files_table
+sub create_files_table ($$$$)
 {
-	my ($filesref, $allfilecomponentsref, $basedir, $allvariables, $uniquefilenamehashref) = @_;
+	my ($filesref, $allfilecomponentsref, $basedir, $allvariables) = @_;
 
 	$installer::logger::Lang->add_timestamp("Performance Info: File Table start");
 
@@ -700,7 +700,7 @@ sub create_files_table
 		if (( $styles =~ /\bJAVAFILE\b/ ) && ( ! ($allvariables->{'JAVAPRODUCT'} ))) { next; }
 
 		$file{'Component_'} = get_file_component_name($onefile, $filesref);
-		$file{'File'} = generate_unique_filename_for_filetable($onefile, $file{'Component_'}, $uniquefilenamehashref);
+		$file{'File'} = generate_unique_filename_for_filetable($onefile, $file{'Component_'});
 	
 		$onefile->{'uniquename'} = $file{'File'};
 		$onefile->{'componentname'} = $file{'Component_'};
@@ -710,7 +710,7 @@ sub create_files_table
 
 		if ( ! exists($allfilecomponents{$file{'Component_'}}) ) { $allfilecomponents{$file{'Component_'}} = 1; }
 
-		$file{'FileName'} = generate_filename_for_filetable($onefile, \%shortnames, $uniquefilenamehashref);
+		$file{'FileName'} = generate_filename_for_filetable($onefile, \%shortnames);
 
 		$file{'FileSize'} = get_filesize($onefile);
 

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/msiglobal.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/msiglobal.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/msiglobal.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/msiglobal.pm Sun Dec  1 11:40:24 2013
@@ -1694,9 +1694,9 @@ sub execute_packaging
 # Setting the global variables ProductCode and the UpgradeCode
 ###############################################################
 
-sub set_global_code_variables
+sub set_global_code_variables ($$)
 {
-	my ( $languagesref, $languagestringref, $allvariableshashref, $alloldproperties ) = @_;
+	my ($languagesref, $allvariableshashref) = @_;
 
 	# In the msi template directory a files "codes.txt" has to exist, in which the ProductCode
 	# and the UpgradeCode for the product are defined.

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/property.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/property.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/property.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/property.pm Sun Dec  1 11:40:24 2013
@@ -308,12 +308,6 @@ sub set_important_properties
     $onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n";
     push(@{$propertyfile}, $onepropertyline);
 
-	if ( $installer::globals::sundirexists )
-	{
-		my $onepropertyline = "SUNDIREXISTS" . "\t" . "1" . "\n";
-		push(@{$propertyfile}, $onepropertyline);			
-	}
-
 	if ( $installer::globals::officedirhostname )
 	{
 		my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n";
@@ -325,12 +319,6 @@ sub set_important_properties
 		push(@{$propertyfile}, $onepropertyline);
 	}
 
-	if ( $installer::globals::sundirhostname )
-	{
-		my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . $installer::globals::sundirhostname . "\n";
-		push(@{$propertyfile}, $onepropertyline);		
-	}
-		
 	if ( $installer::globals::desktoplinkexists )
 	{
 		my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n";

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/registry.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/registry.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/registry.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/windows/registry.pm Sun Dec  1 11:40:24 2013
@@ -77,17 +77,6 @@ sub get_registry_component_name
 	my $styles = "";	
 	if ( $registryref->{'Styles'} ) { $styles = $registryref->{'Styles'}; }
 
-	# Layer links must have unique Component GUID for all products. This is necessary, because only the 
-	# uninstallation of the last product has to delete registry keys.
-	if ( $styles =~ /\bLAYER_REGISTRY\b/ )
-	{
-		$componentname = "g_m_root_registry_layer_ooo_reglayer";
-		# Styles USE_URELAYERVERSION, USE_OOOBASEVERSION
-		if ( $styles =~ /\bUSE_URELAYERVERSION\b/ ) { $addon = "_ure_" . $allvariables->{'URELAYERVERSION'}; }
-		if ( $styles =~ /\bUSE_OOOBASEVERSION\b/ ) { $addon = "_basis_" . $allvariables->{'OOOBASEVERSION'}; }
-		$addon =~ s/\.//g;
-	}
-
 	$componentname = $componentname . $addon;
 
 	if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/worker.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/worker.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/worker.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/worker.pm Sun Dec  1 11:40:24 2013
@@ -733,9 +733,11 @@ sub remove_all_items_with_special_flag
 		if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
 		if ( $styles =~ /\b$flag\b/ )
 		{
-			my $infoline = "Attention: Removing from collector: $oneitem->{'Name'} !\n";
-			$installer::logger::Lang->print($infoline);
-			if ( $flag eq "BINARYTABLE_ONLY" ) { push(@installer::globals::binarytableonlyfiles, $oneitem); }
+			$installer::logger::Lang->printf("Attention: Removing from collector: %s\n", $oneitem->{'Name'});
+			if ($flag eq "BINARYTABLE_ONLY")
+            {
+                push(@installer::globals::binarytableonlyfiles, $oneitem);
+            }
 			next;
 		}
 		push( @allitems, $oneitem );
@@ -2377,7 +2379,6 @@ sub collect_all_files_from_includepathes
 
 		my @sourcefiles = ();
 		my $pathstring = "";
-		# installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles);
 		installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles);
 
 		if ( ! ( $#sourcefiles > -1 ))
@@ -2711,8 +2712,8 @@ sub generate_cygwin_pathes
 
 	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
 	{
-		my $line = ${$filesref}[$i]->{'sourcepath'} . "\n";
-		push(@pathcollector, $line);
+		my $filename = ${$filesref}[$i]->{'sourcepath'};
+		push(@pathcollector, $filename  . "\n");
 		$counter++;
 		
 		if (( $i == $#{$filesref} ) || ((( $counter % $max ) == 0 ) && ( $i > 0 )))
@@ -2728,6 +2729,9 @@ sub generate_cygwin_pathes
 			installer::files::save_file($tmpfilename, \@pathcollector);
 
 			my $success = 0;
+            $installer::logger::Lang->printf(
+                "Converting %d filenames to cygwin notation\n",
+                $counter);
 			my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
 			chomp @cyg_sourcepathlist;
 			
@@ -2737,14 +2741,19 @@ sub generate_cygwin_pathes
 		
 			if ($success)
 			{
-				$infoline = "Success: Successfully converted to cygwin pathes!\n";
-				$installer::logger::Lang->print($infoline);
+                $installer::logger::Lang->printf(
+                    "Successfully converted %d paths to cygwin notation\n",
+                    $counter);
+                $installer::logger::Lang->printf(
+                    "there where %d unique paths\n",
+                    scalar keys %paths);
 			}
 			else
 			{
-				$infoline = "ERROR: Failed to convert to cygwin pathes!\n";
-				$installer::logger::Lang->print($infoline);
-				installer::exiter::exit_program("ERROR: Failed to convert to cygwin pathes!", "generate_cygwin_pathes");
+                $installer::logger::Lang->print("ERROR: Failed to convert to cygwin pathes!\n");
+                installer::exiter::exit_program(
+                    "ERROR: Failed to convert to cygwin pathes!",
+                    "generate_cygwin_pathes");
 			}
 
 			for ( my $j = 0; $j <= $#cyg_sourcepathlist; $j++ )

Modified: openoffice/branches/l10n40/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/bin/modules/installer/ziplist.pm?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/l10n40/main/solenv/bin/modules/installer/ziplist.pm Sun Dec  1 11:40:24 2013
@@ -30,6 +30,121 @@ use installer::logger;
 use installer::parameter;
 use installer::remover;
 use installer::systemactions;
+use strict;
+
+=head2 read_openoffice_lst_file (#loggingdir)
+    Read the settings and variables from the settings file (typically 'openoffice.lst').
+=cut
+sub read_openoffice_lst_file ($$;$)
+{
+    my ($filename, $product_name, $loggingdir) = @_;
+
+    # Read all lines from the settings file.
+    my $ziplistref = installer::files::read_file($filename);
+
+    # Extract the lines of the settings block for the current product.
+    my ($productblockref, $parent) = installer::ziplist::getproductblock(
+        $ziplistref, $product_name, 1);
+    my ($settingsblockref, undef) = installer::ziplist::getproductblock($productblockref, "Settings", 0);
+    $settingsblockref = installer::ziplist::analyze_settings_block($settingsblockref);
+
+    # Split into settings and variables.
+    my $allsettingsarrayref = installer::ziplist::get_settings_from_ziplist($settingsblockref);
+    my $allvariablesarrayref = installer::ziplist::get_variables_from_ziplist($settingsblockref);
+    
+    # global product block from zip.lst
+    my ($globalproductblockref, undef) = installer::ziplist::getproductblock(
+        $ziplistref, $installer::globals::globalblock, 0);
+
+    if ($installer::globals::globallogging && defined $loggingdir)
+    {
+        installer::files::save_file($loggingdir . "productblock.log", $productblockref);
+        installer::files::save_file($loggingdir . "settingsblock.log", $settingsblockref);
+        installer::files::save_file($loggingdir . "allsettings1.log", $allsettingsarrayref);
+        installer::files::save_file($loggingdir . "allvariables1.log", $allvariablesarrayref);
+        installer::files::save_file($loggingdir . "globalproductblock.log", $globalproductblockref);
+    }
+
+    # Integrate parent values.
+    while (defined $parent)
+    {
+        my $parentproductblockref;
+        ($parentproductblockref, $parent) = installer::ziplist::getproductblock($ziplistref, $parent, 1);
+        my ($parentsettingsblockref, undef) = installer::ziplist::getproductblock(
+            $parentproductblockref, "Settings", 0);
+        $parentsettingsblockref = installer::ziplist::analyze_settings_block($parentsettingsblockref);
+        my $allparentsettingsarrayref =	installer::ziplist::get_settings_from_ziplist($parentsettingsblockref);
+        my $allparentvariablesarrayref = installer::ziplist::get_variables_from_ziplist($parentsettingsblockref);
+		if (scalar @$allparentsettingsarrayref > 0)
+        {
+            $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win(
+                $allsettingsarrayref,
+                $allparentsettingsarrayref)
+        }
+		if (scalar @$allparentvariablesarrayref)
+        {
+            $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win(
+                $allvariablesarrayref,
+                $allparentvariablesarrayref)
+        }
+    }
+
+    # Integrate global values.
+    if (scalar @$globalproductblockref)
+    {
+        # settings block from zip.lst
+        my ($globalsettingsblockref, undef) = installer::ziplist::getproductblock(
+            $globalproductblockref, "Settings", 0);
+
+        # select data from settings block in zip.lst
+        $globalsettingsblockref = installer::ziplist::analyze_settings_block($globalsettingsblockref);
+
+        my $allglobalsettingsarrayref = installer::ziplist::get_settings_from_ziplist($globalsettingsblockref);
+        my $allglobalvariablesarrayref = installer::ziplist::get_variables_from_ziplist($globalsettingsblockref);
+
+        if ($installer::globals::globallogging && defined $loggingdir)
+        {
+            installer::files::save_file($loggingdir . "globalsettingsblock1.log", $globalsettingsblockref);
+            installer::files::save_file($loggingdir . "globalsettingsblock2.log", $globalsettingsblockref);
+            installer::files::save_file($loggingdir . "allglobalsettings1.log", $allglobalsettingsarrayref);
+            installer::files::save_file($loggingdir . "allglobalvariables1.log", $allglobalvariablesarrayref);
+        }
+        
+        if (scalar @$allglobalsettingsarrayref > 0)
+        {
+            $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win(
+                $allsettingsarrayref, $allglobalsettingsarrayref);
+        }
+        if (scalar @$allglobalvariablesarrayref > 0)
+        {
+            $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win(
+                $allvariablesarrayref, $allglobalvariablesarrayref);
+        }
+    }
+
+    # Remove multiples (and the trailing ##%##).
+    $allsettingsarrayref = installer::ziplist::remove_multiples_from_ziplist($allsettingsarrayref);
+    $allvariablesarrayref = installer::ziplist::remove_multiples_from_ziplist($allvariablesarrayref);
+    installer::ziplist::replace_variables_in_ziplist_variables($allvariablesarrayref);
+
+    # Transform array into hash.
+    my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref);
+
+    # Postprocess the variables.
+    installer::ziplist::set_default_productversion_if_required($allvariableshashref);
+    installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref);
+    installer::ziplist::overwrite_ooovendor($allvariableshashref);
+    
+    if ($installer::globals::globallogging && defined $loggingdir)
+    {
+        installer::files::save_file($loggingdir . "allsettings2.log" ,$allsettingsarrayref);
+        installer::files::save_file($loggingdir . "allvariables2.log" ,$allvariablesarrayref);
+    }
+
+    # Eventually we should fix this so that we don't have to return the raw arrays, only the resulting hashes.
+    return ($allvariableshashref, $allsettingsarrayref);
+}
+
 
 #################################################
 # Getting data from path file and zip list file
@@ -571,7 +686,7 @@ sub replace_languages_in_pathes
 				my $language = ${$languagesref}[$j];
 				$line =~ s/\$\(LANG\)/$language/g;
 				push(@patharray ,$line);
-				$newdir = $line;
+				my $newdir = $line;
 				$line = $originalline;
 				
 				installer::remover::remove_leading_and_ending_whitespaces(\$newline);
@@ -627,8 +742,6 @@ sub list_all_files_from_include_path
 	}
 
     $installer::logger::Lang->print("\n");
-	
-	return \@filesarray;
 }
 
 #####################################################
@@ -780,9 +893,18 @@ sub add_variables_to_allvariableshashref
 		$variableshashref->{'LCPRODUCTEXTENSION'} = "";		
 	}
 
-	if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; }
-	elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
-	else { $variableshashref->{'PRODUCTADDON'} = ""; }
+	if ($installer::globals::patch)
+    {
+        $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon;
+    }
+	elsif ($installer::globals::languagepack)
+    {
+        $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon;
+    }
+	else
+    {
+        $variableshashref->{'PRODUCTADDON'} = "";
+    }
 
 	my $localbuild = $installer::globals::build;
 	if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }	# using "680" instead of "src680"

Propchange: openoffice/branches/l10n40/main/stlport/
            ('svn:mergeinfo' removed)

Modified: openoffice/branches/l10n40/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/stlport/systemstl/hash_map?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/stlport/systemstl/hash_map (original)
+++ openoffice/branches/l10n40/main/stlport/systemstl/hash_map Sun Dec  1 11:40:24 2013
@@ -69,7 +69,6 @@ public:
 	hash_map& operator=( const hash_map& r) { hash_map c(r); this->swap(c); return *this; }
 #endif
 
-	void resize( size_t n) { _super::rehash(n); }
 private:
 	// setting the hasher dynamically is not supported in the emulation!
 	hash_map( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented
@@ -98,7 +97,6 @@ public:
 	hash_multimap& operator=( const hash_multimap& r) { hash_multimap c(r); this->swap(c); return *this; }
 #endif
 
-	void resize( size_t n) { _super::rehash(n); }
 private:
 	// setting the hasher dynamically is not supported in the emulation!
 	hash_multimap( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented

Modified: openoffice/branches/l10n40/main/stlport/systemstl/hash_set
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/stlport/systemstl/hash_set?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/stlport/systemstl/hash_set (original)
+++ openoffice/branches/l10n40/main/stlport/systemstl/hash_set Sun Dec  1 11:40:24 2013
@@ -58,7 +58,6 @@ class hash_set
 public:
 	hash_set( void) {}
 	hash_set( size_t n) : _super(n) {}
-	void resize( size_t n) { _super::rehash( n); }
 
 #ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem 
 	// in derived classes the copy assignment operator can only be declared implicitly if
@@ -84,7 +83,6 @@ class hash_multiset
 public:
 	hash_multiset( void) {}
 	hash_multiset( size_t n) : _super( n) {}
-	void resize( size_t n) { _super::rehash( n); }
 
 #ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem 
 	// in derived classes the copy assignment operator can only be declared implicitly if

Modified: openoffice/branches/l10n40/main/svl/inc/svl/smplhint.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svl/inc/svl/smplhint.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svl/inc/svl/smplhint.hxx (original)
+++ openoffice/branches/l10n40/main/svl/inc/svl/smplhint.hxx Sun Dec  1 11:40:24 2013
@@ -64,11 +64,11 @@
 class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint
 {
 private:
-	sal_uLong nId;
+	sal_uLong mnId;
 public:
 	TYPEINFO();
-	SfxSimpleHint( sal_uLong nId );
-	sal_uLong GetId() const { return nId; }
+	SfxSimpleHint( sal_uLong nId ) { mnId = nId; }
+	sal_uLong GetId() const { return mnId; }
 };
 
 //--------------------------------------------------------------------

Modified: openoffice/branches/l10n40/main/svl/source/items/whassert.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svl/source/items/whassert.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svl/source/items/whassert.hxx (original)
+++ openoffice/branches/l10n40/main/svl/source/items/whassert.hxx Sun Dec  1 11:40:24 2013
@@ -38,7 +38,7 @@
 			ByteString aMsg( sMessage );									\
 			aMsg.Append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: "));     \
 			aMsg += ByteString::CreateFromInt32( nId );						\
-			DbgError( aMsg.GetBuffer(), __FILE__, __LINE__);	\
+			DbgError( aMsg.GetBuffer() );	\
 		}																	\
 	}																		\
 }

Modified: openoffice/branches/l10n40/main/svl/source/notify/smplhint.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svl/source/notify/smplhint.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svl/source/notify/smplhint.cxx (original)
+++ openoffice/branches/l10n40/main/svl/source/notify/smplhint.cxx Sun Dec  1 11:40:24 2013
@@ -32,12 +32,3 @@
 
 TYPEINIT1(SfxSimpleHint, SfxHint);
 
-//====================================================================
-// creates a SimpleHint with the type nId
-
-SfxSimpleHint::SfxSimpleHint( sal_uLong nIdP )
-{
-	nId = nIdP;
-}
-
-

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/accessibleruler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/accessibleruler.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/accessibleruler.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/accessibleruler.hxx Sun Dec  1 11:40:24 2013
@@ -19,7 +19,6 @@
  * 
  *************************************************************/
 
-//IAccessibility2 Implementation 2009-----
 #ifndef _SVTRULERACCESSIBLE_HXX
 #define _SVTRULERACCESSIBLE_HXX
 
@@ -299,5 +298,4 @@ inline sal_Bool SvtRulerAccessible::IsNo
 
 
 #endif
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/headbar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/headbar.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/headbar.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/headbar.hxx Sun Dec  1 11:40:24 2013
@@ -233,8 +233,7 @@ typedef sal_uInt16 HeaderBarItemBits;
 // - HeaderBar -
 // -------------
 
-class VCLXHeaderBar; // IAccessibility2 Implementation 2009
-
+class VCLXHeaderBar;
 class SVT_DLLPUBLIC HeaderBar : public Window
 {
 private:
@@ -263,8 +262,7 @@ private:
 	Link				maDoubleClickHdl;
 	Link				maCreateAccessibleHdl;
 	
-	VCLXHeaderBar*		m_pVCLXHeaderBar; // IAccessibility2 Implementation 2009
-	
+	VCLXHeaderBar*		m_pVCLXHeaderBar;	
 
 	::com::sun::star::uno::Reference<
 		::com::sun::star::accessibility::XAccessible >
@@ -390,7 +388,6 @@ public:
     virtual ::com::sun::star::uno::Reference<
 		::com::sun::star::accessibility::XAccessible >	CreateAccessible();
 	void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > );
-	// IAccessibility2 Implementation 2009
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate );
 	
 };

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/ruler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/ruler.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/ruler.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/ruler.hxx Sun Dec  1 11:40:24 2013
@@ -32,9 +32,7 @@
 #endif
 #include <vcl/field.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #include <svtools/accessibleruler.hxx>
-//-----IAccessibility2 Implementation 2009
 
 class MouseEvent;
 class TrackingEvent;
@@ -710,9 +708,7 @@ private:
     Link                maDoubleClickHdl;
     Link                maExtraDownHdl;
 
-//IAccessibility2 Implementation 2009-----
 	SvtRulerAccessible* pAccContext;
-//-----IAccessibility2 Implementation 2009
 
 #ifdef _SV_RULER_CXX
     SVT_DLLPRIVATE void                ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 );
@@ -874,9 +870,7 @@ public:
     //set text direction right-to-left
     void                SetTextRTL(sal_Bool bRTL);
 
-//IAccessibility2 Implementation 2009-----
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
-//-----IAccessibility2 Implementation 2009
 };
 
 #endif  // _RULER_HXX

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/svlbitm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/svlbitm.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/svlbitm.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/svlbitm.hxx Sun Dec  1 11:40:24 2013
@@ -42,9 +42,7 @@ class SvLBoxEntry;
 #define SV_ITEM_ID_LBOXBMP			2
 #define SV_ITEM_ID_LBOXBUTTON		3
 #define SV_ITEM_ID_LBOXCONTEXTBMP	4
-//IAccessibility2 Implementation 2009-----
 #define SV_ITEM_ID_EXTENDRLBOXSTRING	5
-//-----IAccessibility2 Implementation 2009
 
 enum SvButtonState { SV_BUTTON_UNCHECKED, SV_BUTTON_CHECKED, SV_BUTTON_TRISTATE };
 
@@ -133,9 +131,7 @@ public:
 	virtual sal_uInt16	IsA();
 	void			InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
 	XubString		GetText() const { return aStr; }
-	//IAccessibility2 Implementation 2009-----
 	virtual XubString		GetExtendText() const {return XubString();}
-	//-----IAccessibility2 Implementation 2009
 	void 			SetText( SvLBoxEntry*, const XubString& rStr );
 	void			Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
 	SvLBoxItem* 	Create() const;
@@ -216,7 +212,6 @@ public:
     // Check whether this button can be modified via UI, sounding a beep if it
     // cannot be modified:
     bool            CheckModification() const;
-	//IAccessible2 implementation 2009
 	SvLBoxButtonData* GetButtonData() const{ return pData;}
 };
 

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/svlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/svlbox.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/svlbox.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/svlbox.hxx Sun Dec  1 11:40:24 2013
@@ -189,7 +189,6 @@ class SVT_DLLPUBLIC SvLBoxEntry : public
 	friend class SvLBox;
 
 	SvPtrarr 	aItems;
-    // IAccessible2 implementation in 2009
     sal_Bool      bIsMarked;
 	void*	 	pUserData;
 	sal_uInt16	 	nEntryFlags;
@@ -219,7 +218,6 @@ public:
 
 	sal_uInt16		GetFlags() const { return nEntryFlags; }
 	void		SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; }
-    // IAccessible2 implementation in 2009
     sal_Bool		GetIsMarked() const { return bIsMarked ; }
 	void		       SetMarked( sal_Bool IsMarked ) { bIsMarked =IsMarked ; }
 };

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/svtools.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/svtools.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/svtools.hrc (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/svtools.hrc Sun Dec  1 11:40:24 2013
@@ -385,7 +385,6 @@
 #define RID_IMG_PRNDLG_COLLATE_HC           (STR_SVT_PRNDLG_START + 31)
 #define RID_IMG_PRNDLG_NOCOLLATE_HC         (STR_SVT_PRNDLG_START + 32)
 
-// IAccessible2 implementation in 2009
 #define STR_PARAGRAPH_START					(STR_SVT_PRNDLG_START + 50)
 #define STR_PARAGRAPH						(STR_PARAGRAPH_START + 0)
 #define STR_PARAGRAPH_END					(STR_PARAGRAPH)

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/svtreebx.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/svtreebx.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/svtreebx.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/svtreebx.hxx Sun Dec  1 11:40:24 2013
@@ -407,7 +407,6 @@ public:
 	/** Enables, that one cell of a tablistbox entry can be focused */
 	void				EnableCellFocus();
 
-// IAccessible2 implementation in 2009-----------
 						// For overwriting accessible role for all entries - normally 0, so each entry can be different
 	void				SetAllEntriesAccessibleRoleType( short n ) { nAllItemAccRoleType = n; }
 	short				GetAllEntriesAccessibleRoleType() const { return nAllItemAccRoleType; }
@@ -418,7 +417,6 @@ public:
 	String				SearchEntryTextWithHeadTitle( SvLBoxEntry* pEntry ) ;
 	virtual	String		GetEntryAltText( SvLBoxEntry* pEntry) const;
 	virtual	String		GetEntryLongDescription( SvLBoxEntry* pEntry) const;	
-// -----------IAccessible2 implementation in 2009
 
 protected:
     using SvListView::Expand;

Modified: openoffice/branches/l10n40/main/svtools/inc/svtools/texteng.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/inc/svtools/texteng.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/inc/svtools/texteng.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/inc/svtools/texteng.hxx Sun Dec  1 11:40:24 2013
@@ -324,7 +324,6 @@ public:
 	static sal_Bool			DoesKeyChangeText( const KeyEvent& rKeyEvent );
 	static sal_Bool			DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
 	static sal_Bool			IsSimpleCharInput( const KeyEvent& rKeyEvent );
-// IAccessible2 implementation in 2009
 	Color 				GetTextColor() {return maTextColor; };
 };
 

Modified: openoffice/branches/l10n40/main/svtools/source/brwbox/brwbox3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/brwbox/brwbox3.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/brwbox/brwbox3.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/brwbox/brwbox3.cxx Sun Dec  1 11:40:24 2013
@@ -215,9 +215,7 @@ sal_Bool BrowseBox::ConvertPointToContro
 
 // Object data and state ------------------------------------------------------
 
-//IAccessibility2 Implementation 2009-----
 OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
-//-----IAccessibility2 Implementation 2009
 {
     OUString aRetText;
     switch( eObjType )
@@ -235,7 +233,6 @@ OUString BrowseBox::GetAccessibleObjectN
 			aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderBar" ) );
 			break;
         case ::svt::BBTYPE_TABLECELL:
-//IAccessibility2 Implementation 2009-----
 			if( ColCount() !=0 && GetRowCount()!=0)
 			{
            
@@ -245,7 +242,6 @@ OUString BrowseBox::GetAccessibleObjectN
 				aRetText += OUString::valueOf(rowId); 
 			}
 			else
-//-----IAccessibility2 Implementation 2009
 				aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TableCell" ) );
 #if OSL_DEBUG_LEVEL > 1
             aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
@@ -260,7 +256,6 @@ OUString BrowseBox::GetAccessibleObjectN
 			sal_Int32 rowId = _nPosition + 1;
 			aRetText = OUString::valueOf( rowId );
 			}
-			//aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderCell" ) );
 #if OSL_DEBUG_LEVEL > 1
             aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
 			aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
@@ -270,7 +265,6 @@ OUString BrowseBox::GetAccessibleObjectN
 #endif
 			break;
         case ::svt::BBTYPE_COLUMNHEADERCELL:
-			//aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderCell" ) );
 			aRetText = OUString( GetColumnDescription( sal_Int16( _nPosition ) ) );
 #if OSL_DEBUG_LEVEL > 1
             aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );

Modified: openoffice/branches/l10n40/main/svtools/source/brwbox/editbrowsebox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/brwbox/editbrowsebox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/brwbox/editbrowsebox.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/brwbox/editbrowsebox.cxx Sun Dec  1 11:40:24 2013
@@ -1072,10 +1072,7 @@ namespace svt
                 {
 					commitTableEvent(
                         ACTIVE_DESCENDANT_CHANGED,
-//IAccessibility2 Implementation 2009-----
-						//makeAny( CreateAccessibleCell( nRow, GetColumnPos( nCol ) ) ),
 						makeAny( CreateAccessibleCell( nRow, GetColumnPos( nCol -1) ) ),
-//-----IAccessibility2 Implementation 2009
 						Any()
 					);
                 }



Mime
View raw message