You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/11/27 18:25:54 UTC
svn commit: r1546124 [14/33] - in /openoffice/branches/alg/aw080: ./ main/
main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/helper/
main/accessibility/inc/accessibility/standard/
main/accessibility/source/extended/ ma...
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/scriptitems.pm Wed Nov 27 17:25:40 2013
@@ -534,7 +534,7 @@ sub add_bundled_extension_blobs
{
# Add the default extensions for the current language set.
# http:// extensions are taken from ext_sources/.
- for my $name (ExtensionsLst::GetExtensionList("http|https", @installer::globals::languageproducts))
+ for my $name (ExtensionsLst::GetExtensionList("http|https", ($installer::globals::languageproduct)))
{
push @bundle_files, $bundlehttpsrc . $name;
}
@@ -542,11 +542,10 @@ sub add_bundled_extension_blobs
}
$installer::logger::Info->printf(
- "preparing %d extension blob%s for language%s %s:\n",
+ "preparing %d extension blob%s for language %s:\n",
$#bundle_files + 1,
$#bundle_files!=0 ? "s" : "",
- $#installer::globals::languageproducts!=0 ? "s" : "",
- join(" ", @installer::globals::languageproducts));
+ $installer::globals::languageproduct);
foreach my $filename ( @bundle_files)
{
@@ -602,18 +601,17 @@ sub add_bundled_prereg_extensions
else
{
# Add extensions from file:// URLs.
- for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
+ for my $name (ExtensionsLst::GetExtensionList("file", ($installer::globals::languageproduct)))
{
push @bundle_files, $name;
}
}
$installer::logger::Info->printf(
- "preparing %d bundled extension%s for language%s %s:\n",
+ "preparing %d bundled extension%s for language %s:\n",
$#bundle_files + 1,
$#bundle_files!=0 ? "s" : "",
- $#installer::globals::languageproducts!=0 ? "s" : "",
- join(" ", @installer::globals::languageproducts));
+ $installer::globals::languageproduct);
foreach my $filename (@bundle_files)
{
$installer::logger::Info->printf(" %s\n", $filename);
@@ -717,12 +715,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;
- }
}
}
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/component.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/component.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/component.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/component.pm Wed Nov 27 17:25:40 2013
@@ -46,11 +46,6 @@ sub get_component_guid
# At this time only a template
my $returnvalue = "\{COMPONENTGUID\}";
- if (( $installer::globals::updatedatabase ) && ( exists($componentidhashref->{$componentname}) ))
- {
- $returnvalue = $componentidhashref->{$componentname};
- }
-
# Returning a ComponentID, that is assigned in scp project
if ( exists($installer::globals::componentid{$componentname}) )
{
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/directory.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/directory.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/directory.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/directory.pm Wed Nov 27 17:25:40 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
@@ -358,8 +357,7 @@ sub create_defaultdir_directorynames
my ($directoryref, $shortdirnamehashref) = @_;
my @shortnames = ();
- if ( $installer::globals::updatedatabase ) { @shortnames = values(%{$shortdirnamehashref}); }
- elsif ( $installer::globals::prepare_winpatch ) { @shortnames = values(%installer::globals::saved83dirmapping); }
+ if ( $installer::globals::prepare_winpatch ) { @shortnames = values(%installer::globals::saved83dirmapping); }
for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
{
@@ -371,11 +369,7 @@ sub create_defaultdir_directorynames
# installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$hostname); # making program/classes to classes
my $uniquename = $onedir->{'uniquename'};
my $shortstring;
- if (( $installer::globals::updatedatabase ) && ( exists($shortdirnamehashref->{$uniquename}) ))
- {
- $shortstring = $shortdirnamehashref->{$uniquename};
- }
- elsif (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::saved83dirmapping{$uniquename}) ))
+ if (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::saved83dirmapping{$uniquename}) ))
{
$shortstring = $installer::globals::saved83dirmapping{$uniquename};
}
@@ -473,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;
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/file.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/file.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/file.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/file.pm Wed Nov 27 17:25:40 2013
@@ -377,16 +377,7 @@ sub generate_unique_filename_for_filetab
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$uniquefilename); # making /registry/schema/org/openoffice/VCL.xcs to VCL.xcs
# Reading unique filename with help of "Component_" in File table from old database
- if (( $installer::globals::updatedatabase ) && ( exists($uniquefilenamehashref->{"$component/$uniquefilename"}) ))
- {
- $uniquefilename = $uniquefilenamehashref->{"$component/$uniquefilename"}; # syntax of $value: ($uniquename;$shortname)
- if ( $uniquefilename =~ /^\s*(.*?)\;\s*(.*?)\s*$/ ) { $uniquefilename = $1; }
- $lcuniquefilename = lc($uniquefilename);
- $installer::globals::alluniquefilenames{$uniquefilename} = 1;
- $installer::globals::alllcuniquefilenames{$lcuniquefilename} = 1;
- return $uniquefilename;
- }
- elsif (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$component/$uniquefilename"}) ))
+ if (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$component/$uniquefilename"}) ))
{
# If we have a FTK mapping for this component/file, use it.
$installer::globals::savedmapping{"$component/$uniquefilename"} =~ m/^(.*);/;
@@ -473,13 +464,7 @@ sub generate_filename_for_filetable
my $shortstring;
# Reading short string with help of "FileName" in File table from old database
- if (( $installer::globals::updatedatabase ) && ( exists($uniquefilenamehashref->{"$fileref->{'componentname'}/$filename"}) ))
- {
- my $value = $uniquefilenamehashref->{"$fileref->{'componentname'}/$filename"}; # syntax of $value: ($uniquename;$shortname)
- if ( $value =~ /^\s*(.*?)\;\s*(.*?)\s*$/ ) { $shortstring = $2; } # already collected in function "collect_shortnames_from_old_database"
- else { $shortstring = $filename; }
- }
- elsif (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"}) ))
+ if (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"}) ))
{
$installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"} =~ m/.*;(.*)/;
if ($1 ne '')
@@ -567,89 +552,6 @@ sub get_fileversion
}
#############################################
-# Returning the sequence for a file
-#############################################
-
-sub get_sequence_for_file
-{
- my ($number, $onefile, $fileentry, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref, $allfilecomponents) = @_;
-
- my $sequence = "";
- my $infoline = "";
- my $pffcomponentname = $onefile->{'componentname'} . "_pff";
-
- if ( $installer::globals::updatedatabase )
- {
- if (( exists($allupdatesequenceshashref->{$onefile->{'uniquename'}}) ) &&
- (( $onefile->{'componentname'} eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} ) ||
- ( $pffcomponentname eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} )))
- {
- # The second condition is necessary to find shifted files, that have same "uniquename", but are now
- # located in another directory. This can be seen at the component name.
- $sequence = $allupdatesequenceshashref->{$onefile->{'uniquename'}};
- $onefile->{'assignedsequencenumber'} = $sequence;
- # Collecting all used sequences, to guarantee, that no number is unused
- $installer::globals::allusedupdatesequences{$sequence} = 1;
- # Special help for files, that already have a "pff" component name (for example after ServicePack 1)
- if ( $pffcomponentname eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} )
- {
- $infoline = "Warning: Special handling for component \"$pffcomponentname\". This file was added after the final, but before this ServicePack.\n";
- $installer::logger::Lang->print($infoline);
- $onefile->{'componentname'} = $pffcomponentname; # pff for "post final file"
- $fileentry->{'Component_'} = $onefile->{'componentname'};
- if ( ! exists($allfilecomponents->{$fileentry->{'Component_'}}) ) { $allfilecomponents->{$fileentry->{'Component_'}} = 1; }
- }
- }
- else
- {
- $installer::globals::updatesequencecounter++;
- $sequence = $installer::globals::updatesequencecounter;
- $onefile->{'assignedsequencenumber'} = $sequence;
- # $onefile->{'assignedcabinetfile'} = $installer::globals::pffcabfilename; # assigning to cabinet file for "post final files"
- # Collecting all new files
- $installer::globals::newupdatefiles{$sequence} = $onefile;
- # Saving in sequence hash
- $allupdatefileorderhashref->{$sequence} = $onefile->{'uniquename'};
-
- # If the new file is part of an existing component, this must be changed now. All files
- # of one component have to be included in one cabinet file. But because the order must
- # not change, all new files have to be added to new components.
- # $onefile->{'componentname'} = $file{'Component_'};
-
- $onefile->{'componentname'} = $onefile->{'componentname'} . "_pff"; # pff for "post final file"
- $fileentry->{'Component_'} = $onefile->{'componentname'};
- if ( ! exists($allfilecomponents->{$fileentry->{'Component_'}}) ) { $allfilecomponents->{$fileentry->{'Component_'}} = 1; }
- $onefile->{'PostFinalFile'} = 1;
- # $installer::globals::pfffileexists = 1;
- # The sequence for this file has changed. It has to be inserted at the end of the files collector.
- $installer::globals::insert_file_at_end = 1;
- $installer::globals::newfilescollector{$sequence} = $onefile; # Adding new files to the end of the filescollector
- $installer::globals::newfilesexist = 1;
- }
- }
- elsif (( $onefile->{'assignedsequencenumber'} ) && ( $installer::globals::use_packages_for_cabs ))
- {
- $sequence = $onefile->{'assignedsequencenumber'};
- }
- else
- {
- $sequence = $number;
- # my $sequence = $number + 1;
-
- # Idea: Each component is packed into a cab file.
- # This requires that all files in one cab file have sequences directly follwing each other,
- # for instance from 1456 to 1466. Then in the media table the LastSequence for this cab file
- # is 1466.
- # Because all files belonging to one component are directly behind each other in the file
- # collector, it is possible to use simply an increasing number as sequence value.
- # If files belonging to one component are not directly behind each other in the files collector
- # this mechanism will no longer work.
- }
-
- return $sequence;
-}
-
-#############################################
# Returning the Windows language of a file
#############################################
@@ -693,91 +595,6 @@ sub generate_registry_keypath
return $keypath;
}
-####################################################################
-# Check, if in an update process files are missing. No removal
-# of files allowed for Windows Patch creation.
-# Also logging all new files, that have to be included in extra
-# components and cab files.
-####################################################################
-
-sub check_file_sequences
-{
- my ($allupdatefileorderhashref, $allupdatecomponentorderhashref) = @_;
-
- # All used sequences stored in %installer::globals::allusedupdatesequences
- # Maximum sequence number of old database stored in $installer::globals::updatelastsequence
- # All new files stored in %installer::globals::newupdatefiles
-
- my $infoline = "";
-
- my @missing_sequences = ();
- my @really_missing_sequences = ();
-
- for ( my $i = 1; $i <= $installer::globals::updatelastsequence; $i++ )
- {
- if ( ! exists($installer::globals::allusedupdatesequences{$i}) ) { push(@missing_sequences, $i); }
- }
-
- if ( $#missing_sequences > -1 )
- {
- # Missing sequences can also be caused by files included in merge modules. This files are added later into the file table.
- # Therefore now it is time to check the content of the merge modules.
-
- for ( my $j = 0; $j <= $#missing_sequences; $j++ )
- {
- my $filename = $allupdatefileorderhashref->{$missing_sequences[$j]};
-
- # Is this a file from a merge module? Then this is no error.
- if ( ! exists($installer::globals::mergemodulefiles{$filename}) )
- {
- push(@really_missing_sequences, $missing_sequences[$j]);
- }
- }
- }
-
- if ( $#really_missing_sequences > -1 )
- {
- my $errorstring = "";
- for ( my $j = 0; $j <= $#really_missing_sequences; $j++ )
- {
- my $filename = $allupdatefileorderhashref->{$really_missing_sequences[$j]};
- my $comp = $allupdatecomponentorderhashref->{$really_missing_sequences[$j]};
- $errorstring = "$errorstring$filename (Sequence: $really_missing_sequences[$j], Component: \"$comp\")\n";
- }
-
- $infoline = "ERROR: Files are removed compared with update database.\nThe following files are missing:\n$errorstring";
- $installer::logger::Lang->print($infoline);
- installer::exiter::exit_program($infoline, "check_file_sequences");
- }
-
- # Searching for new files
-
- my $counter = 0;
-
- foreach my $key ( keys %installer::globals::newupdatefiles )
- {
- my $onefile = $installer::globals::newupdatefiles{$key};
- $counter++;
- if ( $counter == 1 )
- {
- $installer::logger::Lang->print("\n");
- $installer::logger::Lang->print("New files compared to the update database:\n");
- }
-
- $installer::logger::Lang->printf("%s (%s) Sequence: %s\n",
- $onefile->{'Name'},
- $onefile->{'gid'},
- $onefile->{'assignedsequencenumber'});
- }
-
- if ( $counter == 0 )
- {
- $infoline = "Info: No new file compared with update database!\n";
- $installer::logger::Lang->print($infoline);
- }
-
-}
-
###################################################################
# Collecting further conditions for the component table.
# This is used by multilayer products, to enable installation
@@ -844,7 +661,7 @@ sub collect_shortnames_from_old_database
sub create_files_table
{
- my ($filesref, $allfilecomponentsref, $basedir, $allvariables, $uniquefilenamehashref, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref) = @_;
+ my ($filesref, $allfilecomponentsref, $basedir, $allvariables, $uniquefilenamehashref) = @_;
$installer::logger::Lang->add_timestamp("Performance Info: File Table start");
@@ -869,8 +686,6 @@ sub create_files_table
# my @shortnames = ();
my %shortnames = ();
- if ( $installer::globals::updatedatabase ) { collect_shortnames_from_old_database($uniquefilenamehashref, \%shortnames); }
-
installer::windows::idtglobal::write_idt_header(\@filetable, "file");
installer::windows::idtglobal::write_idt_header(\@filehashtable, "filehash");
@@ -911,7 +726,7 @@ sub create_files_table
$installer::globals::insert_file_at_end = 0;
$counter++;
- $file{'Sequence'} = get_sequence_for_file($counter, $onefile, \%file, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref, \%allfilecomponents);
+ $file{'Sequence'} = $counter;
$onefile->{'sequencenumber'} = $file{'Sequence'};
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/media.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/media.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/media.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/media.pm Wed Nov 27 17:25:40 2013
@@ -210,16 +210,7 @@ sub get_last_sequence
{
my ( $cabfilename, $alludpatelastsequences ) = @_;
- my $sequence = 0;
-
- if (( $installer::globals::updatedatabase ) && ( exists($alludpatelastsequences->{$cabfilename}) ))
- {
- $sequence = $alludpatelastsequences->{$cabfilename};
- }
- else
- {
- $sequence = $installer::globals::lastsequence{$cabfilename};
- }
+ my $sequence = $installer::globals::lastsequence{$cabfilename};
return $sequence;
}
@@ -233,7 +224,7 @@ sub get_last_sequence
sub create_media_table
{
- my ($filesref, $basedir, $allvariables, $alludpatelastsequences, $allupdatediskids) = @_;
+ my ($filesref, $basedir, $allvariables) = @_;
my @mediatable = ();
@@ -243,105 +234,7 @@ sub create_media_table
if ( $allvariables->{'INCLUDE_CAB_IN_MSI'} ) { $installer::globals::include_cab_in_msi = 1; }
- if ( $installer::globals::use_packages_for_cabs )
- {
- my $cabfile;
- foreach $cabfile ( sort keys %installer::globals::lastsequence )
- {
- my %media = ();
- $diskid++;
-
- $media{'DiskId'} = get_media_diskid($diskid);
- $media{'LastSequence'} = get_last_sequence($cabfile, $alludpatelastsequences);
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} = get_cabfilename($cabfile);
- $media{'VolumeLabel'} = get_media_volumelabel();
- $media{'Source'} = get_media_source();
-
- my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"
- . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
- push(@mediatable, $oneline);
-
- # Comparing the disk id with the disk id from update database. Both have to be identical. New files have to be added
- # to the new pff cabinet file. And existing cab files must not be removed.
- if ( $installer::globals::updatedatabase )
- {
- # Comparing lines in new media table with line from media table in udpate database.
- if ( exists($allupdatediskids->{$media{'Cabinet'}}) )
- {
- if ( $media{'DiskId'} != $allupdatediskids->{$media{'Cabinet'}} )
- {
- installer::exiter::exit_program("ERROR: Different DiskIDs for cab file \"$media{'Cabinet'}\".\nCurrent installation set: \"$media{'DiskId'}\", but update database used \"$allupdatediskids->{$media{'Cabinet'}}\".\nWere cabinet files removed or added?", "create_media_table");
- }
- }
- else
- {
- $installer::logger::Lang->printf(
- "Warning: Could not find cabinet file \"%s}\" in update database. This seems to be an new cabinet file!?\n",
- $media{'Cabinet'});
- }
- }
- }
-
- # one new cabinet file for all files added after the final release
- if (( $installer::globals::updatedatabase ) && ( $installer::globals::pfffileexists ))
- {
- my %media = ();
- $diskid++;
-
- $media{'DiskId'} = get_media_diskid($diskid) + $installer::globals::mergemodulenumber; # Adding mergemodulenumber, because this files are included later
- $media{'LastSequence'} = $installer::globals::updatesequencecounter;
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} = get_cabfilename($installer::globals::pffcabfilename);
- $media{'VolumeLabel'} = get_media_volumelabel();
- $media{'Source'} = get_media_source();
-
- my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"
- . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
- push(@mediatable, $oneline);
- }
-
- }
- elsif ( $installer::globals::cab_file_per_component )
- {
- for ( my $i = 0; $i <= $#{$filesref}; $i++ )
- {
- my $onefile = ${$filesref}[$i];
- my $nextfile = ${$filesref}[$i+1];
-
- my $filecomponent = "";
- my $nextcomponent = "";
-
- if ( $onefile->{'componentname'} ) { $filecomponent = $onefile->{'componentname'}; }
- if ( $nextfile->{'componentname'} ) { $nextcomponent = $nextfile->{'componentname'}; }
-
- if ( $filecomponent eq $nextcomponent )
- {
- next; # nothing to do, this is not the last file of a component
- }
-
- my %media = ();
- $diskid++;
-
- $media{'DiskId'} = get_media_diskid($diskid);
- $media{'LastSequence'} = get_media_lastsequence($onefile);
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} = get_media_cabinet($diskid);
- $media{'VolumeLabel'} = get_media_volumelabel();
- $media{'Source'} = get_media_source();
-
- my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"
- . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
- push(@mediatable, $oneline);
-
- $media{'Cabinet'} =~ s/^\s*\#//; # removing leading hash
- set_cabinetfilename_for_component_in_file_collector($media{'Cabinet'}, $filesref, $filecomponent, $i);
- }
- }
- elsif ( $installer::globals::fix_number_of_cab_files )
+ if ( $installer::globals::fix_number_of_cab_files )
{
# number of cabfiles
my $maxcabfilenumber = $installer::globals::number_of_cabfiles;
@@ -409,36 +302,6 @@ sub create_media_table
}
}
}
- elsif ( $installer::globals::one_cab_file )
- {
- my %media = ();
- $diskid++;
-
- my $maximumfile = $#{$filesref};
-
- $media{'DiskId'} = get_media_diskid($diskid);
- # $media{'LastSequence'} = ${$filesref}[$maximumfile]->{'sequencenumber'}; # sequence number of the last file
- $media{'LastSequence'} = $maximumfile + 1; # This works also for unsorted file collector
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} = generate_cab_filename($allvariables);
- $media{'VolumeLabel'} = get_media_volumelabel();
- $media{'Source'} = get_media_source();
-
- my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"
- . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
- push(@mediatable, $oneline);
-
- # Saving the cabinet file name in the file collector
-
- $media{'Cabinet'} =~ s/^\s*\#//; # removing leading hash
-
- for ( my $i = 0; $i <= $#{$filesref}; $i++ )
- {
- my $onefile = ${$filesref}[$i];
- $onefile->{'cabinet'} = $media{'Cabinet'};
- }
- }
else
{
installer::exiter::exit_program("ERROR: No cab file specification in globals.pm !", "create_media_table");
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/msiglobal.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/msiglobal.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/msiglobal.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/msiglobal.pm Wed Nov 27 17:25:40 2013
@@ -166,193 +166,7 @@ sub generate_cab_file_list
if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filesref); }
- if ( $installer::globals::use_packages_for_cabs )
- {
- my $sequenceorder = get_sequenceorder($filesref);
-
- my $counter = 1;
- my $currentcabfile = "";
-
- while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
- {
- if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
- {
- # Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
- $counter++;
- next;
- }
-
- # Files with increasing sequencerorder are included in one cab file
- my $onefile = ${$filesref}[$sequenceorder->{$counter}];
- my $cabinetfile = $onefile->{'assignedcabinetfile'};
- my $sourcepath = $onefile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
- my $uniquename = $onefile->{'uniquename'};
-
- my $styles = "";
- my $doinclude = 1;
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
- if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
- # to avoid lines with more than 256 characters, it can be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
- # all files with the same cabinetfile have increasing sequencenumbers
-
- my @ddffile = ();
-
- write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
- if ( $doinclude ) { push(@ddffile, $ddfline); }
-
- $counter++; # increasing the counter
- my $nextfile = "";
- my $nextcabinetfile = "";
- if ( exists($sequenceorder->{$counter}) ) { $nextfile = ${$filesref}[$sequenceorder->{$counter}]; }
- if ( $nextfile->{'assignedcabinetfile'} ) { $nextcabinetfile = $nextfile->{'assignedcabinetfile'}; }
-
- while ( $nextcabinetfile eq $cabinetfile )
- {
- $sourcepath = $nextfile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
- # to avoid lines with more than 256 characters, it can be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
- $uniquename = $nextfile->{'uniquename'};
- my $localdoinclude = 1;
- my $nextfilestyles = "";
- if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
- if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
- $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
- if ( $localdoinclude ) { push(@ddffile, $ddfline); }
-
- $counter++; # increasing the counter!
- $nextcabinetfile = "_lastfile_";
- if ( exists($sequenceorder->{$counter}) )
- {
- $nextfile = ${$filesref}[$sequenceorder->{$counter}];
- $nextcabinetfile = $nextfile->{'assignedcabinetfile'};
- }
- }
-
- # creating the DDF file
-
- my $ddffilename = $cabinetfile;
- $ddffilename =~ s/.cab/.ddf/;
- $ddfdir =~ s/\Q$installer::globals::separator\E\s*$//;
- $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
- installer::files::save_file($ddffilename ,\@ddffile);
- my $infoline = "Created ddf file: $ddffilename\n";
- $installer::logger::Lang->print($infoline);
-
- # lines in ddf files must not be longer than 256 characters
- check_ddf_file(\@ddffile, $ddffilename);
-
- # Writing the makecab system call
-
- my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-
- push(@cabfilelist, $oneline);
-
- # collecting all ddf files
- push(@installer::globals::allddffiles, $ddffilename);
- }
- }
- elsif ((( $installer::globals::cab_file_per_component ) || ( $installer::globals::fix_number_of_cab_files )) && ( $installer::globals::updatedatabase ))
- {
- my $sequenceorder = get_sequenceorder($filesref);
-
- my $counter = 1;
- my $currentcabfile = "";
-
- while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
- {
-# if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
-# {
-# # Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
-# $counter++;
-# next;
-# }
-
- my $onefile = ${$filesref}[$sequenceorder->{$counter}];
- $counter++;
-
- my $cabinetfile = $onefile->{'cabinet'};
- my $sourcepath = $onefile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
- my $uniquename = $onefile->{'uniquename'};
-
- my $styles = "";
- my $doinclude = 1;
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
- if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
- # to avoid lines with more than 256 characters, it can be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
- my @ddffile = ();
-
- write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
- if ( $doinclude ) { push(@ddffile, $ddfline); }
-
- my $nextfile = "";
- if ( ${$filesref}[$sequenceorder->{$counter}] ) { $nextfile = ${$filesref}[$sequenceorder->{$counter}]; }
-
- my $nextcabinetfile = "";
-
- if ( $nextfile->{'cabinet'} ) { $nextcabinetfile = $nextfile->{'cabinet'}; }
-
- while ( $nextcabinetfile eq $cabinetfile )
- {
- $sourcepath = $nextfile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
- # to avoid lines with more than 256 characters, it can be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
- $uniquename = $nextfile->{'uniquename'};
- my $localdoinclude = 1;
- my $nextfilestyles = "";
- if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
- if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
- $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
- if ( $localdoinclude ) { push(@ddffile, $ddfline); }
- $counter++; # increasing the counter!
- $nextfile = "";
- $nextcabinetfile = "_lastfile_";
- if (( exists($sequenceorder->{$counter}) ) && ( ${$filesref}[$sequenceorder->{$counter}] ))
- {
- $nextfile = ${$filesref}[$sequenceorder->{$counter}];
- $nextcabinetfile = $nextfile->{'cabinet'};
- }
- }
-
- # creating the DDF file
-
- my $ddffilename = $cabinetfile;
- $ddffilename =~ s/.cab/.ddf/;
- $ddfdir =~ s/\Q$installer::globals::separator\E\s*$//;
- $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
- installer::files::save_file($ddffilename ,\@ddffile);
- my $infoline = "Created ddf file: $ddffilename\n";
- $installer::logger::Lang->print($infoline);
-
- # lines in ddf files must not be longer than 256 characters
- check_ddf_file(\@ddffile, $ddffilename);
-
- # Writing the makecab system call
-
- my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-
- push(@cabfilelist, $oneline);
-
- # collecting all ddf files
- push(@installer::globals::allddffiles, $ddffilename);
- }
- }
- elsif (( $installer::globals::cab_file_per_component ) || ( $installer::globals::fix_number_of_cab_files ))
+ if ( $installer::globals::fix_number_of_cab_files )
{
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
@@ -428,69 +242,6 @@ sub generate_cab_file_list
push(@installer::globals::allddffiles, $ddffilename);
}
}
- elsif (( $installer::globals::one_cab_file ) && ( $installer::globals::updatedatabase ))
- {
- my $sequenceorder = get_sequenceorder($filesref);
-
- my $counter = 1;
- my $currentcabfile = "";
-
- while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
- {
- if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
- {
- # Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
- $counter++;
- next;
- }
-
- my $onefile = ${$filesref}[$sequenceorder->{$counter}];
-
- $cabinetfile = $onefile->{'cabinet'};
- my $sourcepath = $onefile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
- my $uniquename = $onefile->{'uniquename'};
-
- # to avoid lines with more than 256 characters, it can be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
- if ( $counter == 1 ) { write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); }
-
- my $styles = "";
- my $doinclude = 1;
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
- if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
- if ( $doinclude ) { push(@ddffile, $ddfline); }
-
- $counter++; # increasing the counter
- }
-
- # creating the DDF file
-
- my $ddffilename = $cabinetfile;
- $ddffilename =~ s/.cab/.ddf/;
- $ddfdir =~ s/[\/\\]\s*$//;
- $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
- installer::files::save_file($ddffilename ,\@ddffile);
- my $infoline = "Created ddf file: $ddffilename\n";
- $installer::logger::Lang->print($infoline);
-
- # lines in ddf files must not be longer than 256 characters
- check_ddf_file(\@ddffile, $ddffilename);
-
- # Writing the makecab system call
-
- # my $oneline = "makecab.exe /F " . $ddffilename . "\n";
- my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-
- push(@cabfilelist, $oneline);
-
- # collecting all ddf files
- push(@installer::globals::allddffiles, $ddffilename);
- }
elsif ( $installer::globals::one_cab_file )
{
my @ddffile = ();
@@ -1405,28 +1156,6 @@ sub copy_windows_installer_files_into_in
}
#################################################################
-# Copying MergeModules for the Windows installer into the
-# installation set. The list of MergeModules is located
-# in %installer::globals::copy_msm_files
-#################################################################
-
-sub copy_merge_modules_into_installset
-{
- my ($installdir) = @_;
-
- installer::logger::include_header_into_logfile("Copying Merge files into installation set");
-
- my $cabfile;
- foreach $cabfile ( keys %installer::globals::copy_msm_files )
- {
- my $sourcefile = $installer::globals::copy_msm_files{$cabfile};
- my $destfile = $installdir . $installer::globals::separator . $cabfile;
-
- installer::systemactions::copy_one_file($sourcefile, $destfile);
- }
-}
-
-#################################################################
# Copying the child projects into the
# installation set
#################################################################
@@ -2016,11 +1745,7 @@ sub set_global_code_variables
}
# ProductCode must not change, if Windows patches shall be applied
- if ( $installer::globals::updatedatabase )
- {
- $installer::globals::productcode = $alloldproperties->{'ProductCode'};
- }
- elsif ( $installer::globals::prepare_winpatch )
+ if ( $installer::globals::prepare_winpatch )
{
# ProductCode has to be specified in each language
my $searchstring = "PRODUCTCODE";
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/property.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/property.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/property.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/property.pm Wed Nov 27 17:25:40 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/alg/aw080/main/solenv/bin/modules/installer/windows/registry.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/registry.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/registry.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/windows/registry.pm Wed Nov 27 17:25:40 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/alg/aw080/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/ziplist.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/installer/ziplist.pm Wed Nov 27 17:25:40 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"
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/par2script/globals.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/par2script/globals.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/par2script/globals.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/par2script/globals.pm Wed Nov 27 17:25:40 2013
@@ -39,8 +39,7 @@ BEGIN
@allitems = ("Installation", "ScpAction", "Directory", "File",
"Shortcut", "Unixlink", "Module", "Profile", "ProfileItem",
- "Folder", "FolderItem", "RegistryItem", "WindowsCustomAction",
- "MergeModule");
+ "Folder", "FolderItem", "RegistryItem", "WindowsCustomAction");
@items_assigned_at_modules = ("File", "Directory", "Unixlink");
@items_with_directories = ("File", "Profile", "Shortcut", "Unixlink");
Modified: openoffice/branches/alg/aw080/main/solenv/bin/modules/pre2par/globals.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/bin/modules/pre2par/globals.pm?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/bin/modules/pre2par/globals.pm (original)
+++ openoffice/branches/alg/aw080/main/solenv/bin/modules/pre2par/globals.pm Wed Nov 27 17:25:40 2013
@@ -38,8 +38,7 @@ BEGIN
@allitems = ("Installation", "ScpAction", "HelpText", "Directory", "DataCarrier", "StarRegistry", "File",
"Shortcut", "Custom", "Unixlink", "Procedure", "Module", "Profile", "ProfileItem",
- "Folder", "FolderItem", "RegistryItem", "StarRegistryItem", "WindowsCustomAction",
- "MergeModule");
+ "Folder", "FolderItem", "RegistryItem", "StarRegistryItem", "WindowsCustomAction");
$logging = 0;
$logfilename = "logfile.log"; # the default logfile name for global errors
Modified: openoffice/branches/alg/aw080/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk (original)
+++ openoffice/branches/alg/aw080/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk Wed Nov 27 17:25:40 2013
@@ -43,7 +43,6 @@ static const Path UPD;
static const String CVER;
static const String LIBXML_CFLAGS;
static const String OS;
-static const String STLPORT_VER;
static const Bool DEBUG;
static const Bool PRODUCT;
Modified: openoffice/branches/alg/aw080/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/gbuild/gbuild.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/branches/alg/aw080/main/solenv/gbuild/gbuild.mk Wed Nov 27 17:25:40 2013
@@ -34,7 +34,6 @@
# PRODUCT
# SOLARINC
# SOLARLIB
-# STLPORT_VER
# UPD
# GXX_INCLUDE_PATH (Linux)
@@ -163,11 +162,6 @@ gb_GLOBALDEFS := \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
-ifneq ($(USE_SYSTEM_STL),YES)
-gb_GLOBALDEFS += \
- -DSTLPORT_VERSION=$(STLPORT_VER)
-endif
-
ifeq ($(gb_PRODUCT),$(true))
gb_GLOBALDEFS += \
-DPRODUCT \
Modified: openoffice/branches/alg/aw080/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/gbuild/platform/macosx.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/alg/aw080/main/solenv/gbuild/platform/macosx.mk Wed Nov 27 17:25:40 2013
@@ -301,19 +301,9 @@ gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
-ifeq ($(CPUNAME),INTEL)
gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else # ifeq ($(CPUNAME),POWERPC)
-gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
gb_Library__FRAMEWORKS := \
Cocoa \
Modified: openoffice/branches/alg/aw080/main/solenv/inc/lldb4aoo.py
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/inc/lldb4aoo.py?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/inc/lldb4aoo.py (original)
+++ openoffice/branches/alg/aw080/main/solenv/inc/lldb4aoo.py Wed Nov 27 17:25:40 2013
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: openoffice/branches/alg/aw080/main/solenv/inc/unxlng.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/inc/unxlng.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/inc/unxlng.mk (original)
+++ openoffice/branches/alg/aw080/main/solenv/inc/unxlng.mk Wed Nov 27 17:25:40 2013
@@ -39,7 +39,8 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
+CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -226,24 +227,6 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
Modified: openoffice/branches/alg/aw080/main/solenv/inc/unxmacx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/inc/unxmacx.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/branches/alg/aw080/main/solenv/inc/unxmacx.mk Wed Nov 27 17:25:40 2013
@@ -34,14 +34,9 @@ LINKOUTPUT_FILTER=
# Definitions that we may need on the compile line.
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
-.IF "$(GUIBASE)"=="aqua"
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
+
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build result
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
# done in setsolar/configure now. left here for documentation
@@ -49,7 +44,6 @@ CDEFS+=-DX_LOCALE
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+=-DQUARTZ
EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
-.ENDIF
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
Modified: openoffice/branches/alg/aw080/main/solenv/inc/wntmsci11.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/solenv/inc/wntmsci11.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/branches/alg/aw080/main/solenv/inc/wntmsci11.mk Wed Nov 27 17:25:40 2013
@@ -219,7 +219,7 @@ CFLAGSWERRCC=-WX
MODULES_WITH_WARNINGS := \
soldep
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"
_VC_MANIFEST_BASENAME=__VC80
.ELSE
Modified: openoffice/branches/alg/aw080/main/starmath/source/accessibility.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/starmath/source/accessibility.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/starmath/source/accessibility.cxx (original)
+++ openoffice/branches/alg/aw080/main/starmath/source/accessibility.cxx Wed Nov 27 17:25:40 2013
@@ -1421,12 +1421,12 @@ sal_Bool SmTextForwarder::GetWordIndices
return bRes;
}
-sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
+sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ?
- SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex )
- : sal_False;
+ SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex, bInCell )
+ : sal_False;
}
sal_uInt16 SmTextForwarder::GetLineCount( sal_uInt16 nPara ) const
Modified: openoffice/branches/alg/aw080/main/starmath/source/accessibility.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/starmath/source/accessibility.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/starmath/source/accessibility.hxx (original)
+++ openoffice/branches/alg/aw080/main/starmath/source/accessibility.hxx Wed Nov 27 17:25:40 2013
@@ -245,9 +245,9 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
- virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
- virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+ virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
+ virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
+ virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
virtual sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual sal_Bool Delete( const ESelection& );
Modified: openoffice/branches/alg/aw080/main/stlport/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/stlport/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/stlport/makefile.mk (original)
+++ openoffice/branches/alg/aw080/main/stlport/makefile.mk Wed Nov 27 17:25:40 2013
@@ -30,17 +30,7 @@ TARGET=so_stlport
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)"=="YES"
-
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-# System STL when building with SunStudio is just a version of STLport
-# which comes with the compiler
-all:
- @echo "Nothing to do"
-.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-#
-# If you choose to build without stlport, some headers will be used to bring the
-# sgi extensions into the std namespace:
+# Wrap STL headers to get them into the std namespace:
$(INCCOM)$/stlport$/functional \
$(INCCOM)$/stlport$/hash_map \
$(INCCOM)$/stlport$/hash_set \
@@ -52,156 +42,4 @@ $(INCCOM)$/stlport$/set \
$(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-
-.ELSE # "$(USE_SYSTEM_STL)"
-
-# --- Files --------------------------------------------------------
-.EXPORT : CC CXX
-.IF "$(COMID)"=="gcc3"
- TARFILE_NAME=STLport-4.5
- TARFILE_MD5=18f577b374d60b3c760a3a3350407632
- PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch
-.ELIF "$(GUI)"=="WNT"
- TARFILE_NAME=STLport-4.5-0119
- TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
- PATCH_FILES=STLport-4.5-0119.patch
-.ELSE
- TARFILE_NAME=STLport-4.0
- TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
- PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch
- # To disable warnings from within STLport headers on unxsoli4 and
- # unxsols4, STLport-4.0.patch had to be extended mechanically by
- #
- # cd unxsol.../misc/build/STLport-4.0/stlport && \
- # find . -type f -exec sed -i \
- # -e 's/^\([ \t]*__STL_BEGIN_NAMESPACE[ \t]*\)$/#if defined \
- # __SUNPRO_CC\n#pragma disable_warn\n#endif\n&/' \
- # -e 's/^\([ \t]*__STL_END_NAMESPACE[ \t]*\)$/&\n#if defined \
- # __SUNPRO_CC\n#pragma enable_warn\n#endif/' {} \;
- #
- # (causing lots of files to become modified) and by additionally
- # changing unxsol.../misc/build/STLport-4.0/stlport/math.h,
- # unxsol.../misc/build/STLport-4.0/stlport/stl/_config.h,
- # unxsol.../misc/build/STLport-4.0/stlport/stl/_list.h, and
- # unxsol.../misc/build/STLport-4.0/stlport/stl/type_traits.h manually.
- # (Obviously due to the way the C++ compiler generates code for
- # instantiations of inline function templates from STLport headers, it
- # does not work to simply add "#pragma disable_warn" to stl/_prolog.h
- # and "#pragma enable_warn" to stl/_epilog.h, as seemingly some internal
- # STLport headers are read in by the compiler only at the end of a
- # compilation unit, outside the scope of stl/_prolog.h and
- # stl/_epilog.h.)
-.ENDIF
-
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \
- src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak
-
-
-CONFIGURE_ACTION=none
-CONFIGURE_FLAGS=
-
-BUILD_DIR=src
-
-.IF "$(COM)"=="MSC"
-BUILD_ACTION=nmake
-BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
-.ENDIF
-
-.IF "$(COM)"=="GCC"
- .IF "$(COMID)"=="gcc3"
- # FreeBSD needs a special makefile
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-3.0-freebsd.mak
- .ELIF "$(OS)"=="OS2"
- BUILD_FLAGS=-f gcc-3.0-os2.mak
- .ELIF "$(GUI)"=="WNT"
- BUILD_FLAGS=-f gcc-3.0-mingw.mak
- .ELSE
- BUILD_FLAGS=-f gcc-3.0.mak
- .ENDIF
- .ELSE # "$(COMID)"=="gcc3"
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-freebsd.mak
- .ELSE
- BUILD_FLAGS=-f gcc.mak
- .ENDIF
- .ENDIF # "$(COMID)"=="gcc3"
- BUILD_ACTION=$(GNUMAKE)
- # build in parallel
- BUILD_FLAGS+= -j$(MAXPROCESS)
-.ENDIF
-.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
-CXX+= -Wl,--hash-style=both
-.ENDIF
-
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-.IF "$(COM)"=="C52"
-BUILD_ACTION=make
-.IF "$(CCNUMVER)">="00050008"
-BUILD_FLAGS=-f sunpro11.mak
-.ELIF "$(CCNUMVER)">="00050005"
-BUILD_FLAGS=-f sunpro8.mak
-.ELSE
-BUILD_FLAGS=-f sunpro6.mak
-.ENDIF # "$(CCNUMVER)">="00050008"
-
-OUT2INC= \
- stlport$/SC5$/*.SUNWCCh
-.ENDIF
-
-OUTDIR2INC= \
- stlport
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-OUT2LIB= \
- lib$/lib*_static.a
-
-OUT2BIN= \
- lib$/*.dll
-
-.ELSE
-
-OUT2LIB= \
- lib$/*.lib
-
-OUT2BIN= \
- lib$/*.dll \
- lib$/*.pdb
-
-.ENDIF # "$(COM)"=="GCC"
-
-.ELIF "$(GUI)"=="OS2"
-
-OUT2LIB= lib$/*.lib
-OUT2BIN= lib$/*.dll
-
-.ELSE # "$(GUI)"=="WNT"
-
-OUT2LIB= \
- lib$/lib*
-
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(STLPORT4)"!="NO_STLPORT4"
-all :
- @echo " An already available installation of STLport has been chosen in the configure process."
- @echo " Therefore the version provided here does not need to be built in addition."
-.ELIF "$(OS)"=="MACOSX"
-all:
- @echo '--with-stlport=yes is not supported on Mac OS X'
- false
-.ENDIF
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-.ENDIF # "$(USE_SYSTEM_STL)"
Modified: openoffice/branches/alg/aw080/main/stlport/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/stlport/prj/d.lst?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/stlport/prj/d.lst (original)
+++ openoffice/branches/alg/aw080/main/stlport/prj/d.lst Wed Nov 27 17:25:40 2013
@@ -1,25 +1,4 @@
mkdir: %_DEST%\inc%_EXT%\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl\debug
-mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers
-mkdir: %_DEST%\inc%_EXT%\stl\config
-mkdir: %_DEST%\inc%_EXT%\stl\using
-mkdir: %_DEST%\inc%_EXT%\stl\using\h
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
-..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\*
..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\*
-..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\*
-..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\*
-..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\*
-..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\*
-..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
-..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
-..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
Modified: openoffice/branches/alg/aw080/main/svl/inc/svl/smplhint.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svl/inc/svl/smplhint.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svl/inc/svl/smplhint.hxx (original)
+++ openoffice/branches/alg/aw080/main/svl/inc/svl/smplhint.hxx Wed Nov 27 17:25:40 2013
@@ -64,10 +64,10 @@
class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint
{
private:
- sal_uLong nId;
+ sal_uLong mnId;
public:
SfxSimpleHint( sal_uLong nId );
- sal_uLong GetId() const { return nId; }
+ sal_uLong GetId() const { return mnId; }
};
//--------------------------------------------------------------------
Modified: openoffice/branches/alg/aw080/main/svl/inc/svl/zformat.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svl/inc/svl/zformat.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svl/inc/svl/zformat.hxx (original)
+++ openoffice/branches/alg/aw080/main/svl/inc/svl/zformat.hxx Wed Nov 27 17:25:40 2013
@@ -160,7 +160,7 @@ public:
const SvNumberNatNum& GetNatNum() const { return aNatNum; }
// check, if the format code contains a subformat for text
- const bool HasTextFormatCode() const;
+ bool HasTextFormatCode() const;
private:
ImpSvNumberformatInfo aI; // Hilfsstruct fuer die restlichen Infos
@@ -336,7 +336,7 @@ public:
sal_Bool HasNewCurrency() const;
// check, if the format code contains a subformat for text
- const bool HasTextFormatCode() const;
+ bool HasTextFormatCode() const;
// Build string from NewCurrency for saving it SO50 compatible
void Build50Formatstring( String& rStr ) const;
Modified: openoffice/branches/alg/aw080/main/svl/source/notify/smplhint.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svl/source/notify/smplhint.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svl/source/notify/smplhint.cxx (original)
+++ openoffice/branches/alg/aw080/main/svl/source/notify/smplhint.cxx Wed Nov 27 17:25:40 2013
@@ -19,22 +19,17 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
#include <svl/smplhint.hxx>
//====================================================================
// creates a SimpleHint with the type nId
-
SfxSimpleHint::SfxSimpleHint( sal_uLong nIdP )
{
- nId = nIdP;
+ mnId = nIdP;
}
-
+// eof
Modified: openoffice/branches/alg/aw080/main/svl/source/numbers/zformat.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svl/source/numbers/zformat.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svl/source/numbers/zformat.cxx (original)
+++ openoffice/branches/alg/aw080/main/svl/source/numbers/zformat.cxx Wed Nov 27 17:25:40 2013
@@ -406,7 +406,7 @@ sal_Bool ImpSvNumFor::HasNewCurrency() c
return sal_False;
}
-const bool ImpSvNumFor::HasTextFormatCode() const
+bool ImpSvNumFor::HasTextFormatCode() const
{
return aI.eScannedType == NUMBERFORMAT_TEXT;
}
@@ -1722,7 +1722,7 @@ sal_Bool SvNumberformat::HasNewCurrency(
return sal_False;
}
-const bool SvNumberformat::HasTextFormatCode() const
+bool SvNumberformat::HasTextFormatCode() const
{
for ( sal_uInt16 j=0; j<4; j++ )
{
Modified: openoffice/branches/alg/aw080/main/svtools/AllLangResTarget_svt.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/AllLangResTarget_svt.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/AllLangResTarget_svt.mk (original)
+++ openoffice/branches/alg/aw080/main/svtools/AllLangResTarget_svt.mk Wed Nov 27 17:25:40 2013
@@ -49,6 +49,7 @@ $(eval $(call gb_SrsTarget_add_files,svt
svtools/source/control/ctrlbox.src \
svtools/source/control/ctrltool.src \
svtools/source/control/filectrl.src \
+ svtools/source/control/ruler.src \
svtools/source/dialogs/addresstemplate.src \
svtools/source/dialogs/filedlg2.src \
svtools/source/dialogs/formats.src \
Modified: openoffice/branches/alg/aw080/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/Library_svt.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/Library_svt.mk (original)
+++ openoffice/branches/alg/aw080/main/svtools/Library_svt.mk Wed Nov 27 17:25:40 2013
@@ -126,6 +126,7 @@ $(eval $(call gb_Library_add_exception_o
svtools/source/contnr/templwin \
svtools/source/contnr/tooltiplbox \
svtools/source/contnr/treelist \
+ svtools/source/control/accessibleruler \
svtools/source/control/asynclink \
svtools/source/control/calendar \
svtools/source/control/collatorres \
@@ -157,6 +158,8 @@ $(eval $(call gb_Library_add_exception_o
svtools/source/control/urlcontrol \
svtools/source/control/valueacc \
svtools/source/control/valueset \
+ svtools/source/control/vclxaccessibleheaderbar \
+ svtools/source/control/vclxaccessibleheaderbaritem \
svtools/source/dialogs/addresstemplate \
svtools/source/dialogs/colrdlg \
svtools/source/dialogs/filedlg \
Modified: openoffice/branches/alg/aw080/main/svtools/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/Package_inc.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/Package_inc.mk (original)
+++ openoffice/branches/alg/aw080/main/svtools/Package_inc.mk Wed Nov 27 17:25:40 2013
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_add_file,svtool
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibleruler.hxx,svtools/accessibleruler.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx))
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/embedhlp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/embedhlp.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/embedhlp.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/embedhlp.hxx Wed Nov 27 17:25:40 2013
@@ -117,11 +117,12 @@ namespace svt
void UpdateReplacementOnDemand();
MapUnit GetMapUnit() const;
void Lock( sal_Bool bLock = sal_True );
- sal_Bool IsLocked() const;
+ sal_Bool IsLocked() const;
void Clear();
- sal_Bool is() const { return mxObj.is(); }
+ sal_Bool is() const { return mxObj.is(); }
- sal_Bool IsChart() const;
+ sal_Bool IsChart() const;
+ rtl::OUString GetChartType();
// #i104867#
// Provides a graphic version number for the fetchable Graphic during this object's lifetime. Internally,
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/headbar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/headbar.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/headbar.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/headbar.hxx Wed Nov 27 17:25:40 2013
@@ -233,6 +233,8 @@ typedef sal_uInt16 HeaderBarItemBits;
// - HeaderBar -
// -------------
+class VCLXHeaderBar; // IAccessibility2 Implementation 2009
+
class SVT_DLLPUBLIC HeaderBar : public Window
{
private:
@@ -260,6 +262,9 @@ private:
Link maSelectHdl;
Link maDoubleClickHdl;
Link maCreateAccessibleHdl;
+
+ VCLXHeaderBar* m_pVCLXHeaderBar; // IAccessibility2 Implementation 2009
+
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >
@@ -385,6 +390,9 @@ 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 );
+
};
#endif // _HEADBAR_HXX
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/ruler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/ruler.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/ruler.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/ruler.hxx Wed Nov 27 17:25:40 2013
@@ -32,6 +32,10 @@
#endif
#include <vcl/field.hxx>
+//IAccessibility2 Implementation 2009-----
+#include <svtools/accessibleruler.hxx>
+//-----IAccessibility2 Implementation 2009
+
class MouseEvent;
class TrackingEvent;
class DataChangedEvent;
@@ -706,6 +710,10 @@ 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 );
SVT_DLLPRIVATE void ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 );
@@ -865,6 +873,10 @@ 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/alg/aw080/main/svtools/inc/svtools/svlbitm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbitm.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbitm.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbitm.hxx Wed Nov 27 17:25:40 2013
@@ -42,6 +42,9 @@ 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 };
@@ -130,6 +133,9 @@ 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;
@@ -210,6 +216,8 @@ 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;}
};
inline void SvLBoxButton::SetStateChecked()
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbox.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbox.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/svlbox.hxx Wed Nov 27 17:25:40 2013
@@ -189,6 +189,8 @@ class SVT_DLLPUBLIC SvLBoxEntry : public
friend class SvLBox;
SvPtrarr aItems;
+ // IAccessible2 implementation in 2009
+ sal_Bool bIsMarked;
void* pUserData;
sal_uInt16 nEntryFlags;
//#if 0 // _SOLAR__PRIVATE
@@ -217,6 +219,9 @@ 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/alg/aw080/main/svtools/inc/svtools/svtools.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtools.hrc Wed Nov 27 17:25:40 2013
@@ -247,7 +247,7 @@
#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE (STR_SVT_ACC_BEGIN+7)
#define STR_SVT_ACC_RULER_VERT_NAME (STR_SVT_ACC_BEGIN+8)
#define STR_SVT_ACC_RULER_HORZ_NAME (STR_SVT_ACC_BEGIN+9)
-#define STR_SVT_ACC_END (STR_SVT_ACC_EMPTY_FIELD)
+#define STR_SVT_ACC_END (STR_SVT_ACC_RULER_HORZ_NAME)
#define STR_SVT_INDEXENTRY_START (STR_SVT_ACC_END + 1)
#define STR_SVT_INDEXENTRY_ALPHANUMERIC (STR_SVT_INDEXENTRY_START+0)
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtreebx.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtreebx.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtreebx.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/svtreebx.hxx Wed Nov 27 17:25:40 2013
@@ -43,6 +43,11 @@ class TabBar;
#define TREEFLAG_MANINS 0x0004
#define TREEFLAG_RECALCTABS 0x0008
+#define TREEBOX_ALLITEM_ACCROLE_TYPE_NOTSET 0x00
+#define TREEBOX_ALLITEM_ACCROLE_TYPE_LIST 0x01
+#define TREEBOX_ALLITEM_ACCROLE_TYPE_TREE 0x02
+
+
typedef sal_Int64 ExtendedWinBits;
// disable the behavior of automatically selecting a "CurEntry" upon painting the control
@@ -71,7 +76,9 @@ class SVT_DLLPUBLIC SvTreeListBox : publ
short nEntryHeightOffs;
short nIndent;
short nFocusWidth;
- sal_uInt16 aContextBmpMode;
+ sal_uInt16 aContextBmpMode;
+
+ short nAllItemAccRoleType;
#ifdef _SVTREEBX_CXX
DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
@@ -400,6 +407,19 @@ 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; }
+
+ sal_uInt16 GetTreeFlags() const {return nTreeFlags;}
+
+ XubString headString ;
+ String SearchEntryTextWithHeadTitle( SvLBoxEntry* pEntry ) ;
+ virtual String GetEntryAltText( SvLBoxEntry* pEntry) const;
+ virtual String GetEntryLongDescription( SvLBoxEntry* pEntry) const;
+// -----------IAccessible2 implementation in 2009
+
protected:
using SvListView::Expand;
using SvListView::Collapse;
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/texteng.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/texteng.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/texteng.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/texteng.hxx Wed Nov 27 17:25:40 2013
@@ -324,6 +324,8 @@ 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; };
};
#endif // _TEXTENG_HXX
Modified: openoffice/branches/alg/aw080/main/svtools/inc/svtools/treelist.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/svtools/inc/svtools/treelist.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/svtools/inc/svtools/treelist.hxx (original)
+++ openoffice/branches/alg/aw080/main/svtools/inc/svtools/treelist.hxx Wed Nov 27 17:25:40 2013
@@ -56,6 +56,8 @@
#define SVLISTENTRYFLAG_FOCUSED 0x0004
#define SVLISTENTRYFLAG_CURSORED 0x0008
#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
+// IAccessible2 implementation
+#define SVLISTENTRYFLAG_OBJSELECTED 0x0040
class SvListEntry;
@@ -152,6 +154,14 @@ public:
nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
}
bool IsSelectable() const { return (bool)(nFlags&SVLISTENTRYFLAG_NOT_SELECTABLE)==0; }
+ // IAccessible2 implementation
+ void SetObjectSelected(sal_Bool bSelected)
+ {
+ if ( !bSelected )
+ nFlags &= (~SVLISTENTRYFLAG_OBJSELECTED);
+ else
+ nFlags |= SVLISTENTRYFLAG_OBJSELECTED;
+ }
};
enum SvSortMode { SortAscending, SortDescending, SortNone };