openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1551937 [20/29] - in /openoffice/branches/ooxml-osba: ./ extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/ extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/...
Date Wed, 18 Dec 2013 13:27:25 GMT
Modified: openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/registry.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/registry.pm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/registry.pm (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/registry.pm Wed Dec 18 13:27:09 2013
@@ -29,6 +29,8 @@ use installer::worker;
 use installer::windows::msiglobal;
 use installer::windows::idtglobal;
 
+use strict;
+
 #####################################################
 # Generating the component name from a registryitem
 #####################################################
@@ -45,7 +47,10 @@ sub get_registry_component_name
 	my $componentname = "";
 	my $isrootmodule = 0;
 	
-	if ( $registryref->{'ModuleID'} ) { $componentname = $registryref->{'ModuleID'}; }
+	if ($registryref->{'ModuleID'})
+    {
+        $componentname = $registryref->{'ModuleID'};
+    }
 	
 	$componentname =~ s/\\/\_/g;
 	$componentname =~ s/\//\_/g;
@@ -54,7 +59,10 @@ sub get_registry_component_name
 
 	$componentname = lc($componentname);	# componentnames always lowercase
 
-	if ( $componentname eq "gid_module_root" ) { $isrootmodule = 1; }
+	if ( $componentname eq "gid_module_root" )
+    {
+        $isrootmodule = 1;
+    }
 
 	# Attention: Maximum length for the componentname is 72 
 	
@@ -67,31 +75,36 @@ sub get_registry_component_name
 	
 	# This componentname must be more specific
 	my $addon = "_";
-	if ( $allvariables->{'PRODUCTNAME'} ) { $addon = $addon . $allvariables->{'PRODUCTNAME'}; }
-	if ( $allvariables->{'PRODUCTVERSION'} ) { $addon = $addon . $allvariables->{'PRODUCTVERSION'}; }
+	if ($allvariables->{'PRODUCTNAME'})
+    {
+        $addon .= $allvariables->{'PRODUCTNAME'};
+    }
+
+    # Append the version number.
+    # Previously that was the full version number as provided by 'PRODUCTVERSION'.
+    # But MSI patches introduce the restriction that component names must not change.
+    # Use just the major version number.
+    my $version = $allvariables->{"BRANDPACKAGEVERSION"} // "";
+    $addon .= $version;
 	$addon = lc($addon);
 	$addon =~ s/ //g;
 	$addon =~ s/-//g;
 	$addon =~ s/\.//g;
 
-	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"; }
-	if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
+	my $styles = $registryref->{'Styles'};
+	if (defined $styles)
+    {
+        if (($styles =~ /\bLANGUAGEPACK\b/) && $installer::globals::languagepack)
+        {
+            $componentname .= "_lang";
+        }
+        if ($styles =~ /\bALWAYS_REQUIRED\b/)
+        {
+            $componentname .= "_forced";
+        }
+    }
 
 	# Attention: Maximum length for the componentname is 72
 	# %installer::globals::allregistrycomponents_in_this_database_ : resetted for each database	
@@ -101,10 +114,13 @@ sub get_registry_component_name
 
 	my $fullname = $componentname;  # This can be longer than 72
 		
-	if (( exists($installer::globals::allregistrycomponents_{$fullname}) ) && ( ! exists($installer::globals::allregistrycomponents_in_this_database_{$fullname}) ))
+	if (exists($installer::globals::allregistrycomponents_{$fullname})
+        && ! exists($installer::globals::allregistrycomponents_in_this_database_{$fullname}))
 	{
 		# This is not allowed: One component cannot be installed with different packages.
-		installer::exiter::exit_program("ERROR: Windows registry component \"$fullname\" is already included into another package. This is not allowed.", "get_registry_component_name");
+		installer::exiter::exit_program(
+            "ERROR: Windows registry component \"$fullname\" is already included into another package. This is not allowed.",
+            "get_registry_component_name");
 	}
 		
 	if ( exists($installer::globals::allregistrycomponents_{$fullname}) )
@@ -122,7 +138,10 @@ sub get_registry_component_name
 		$installer::globals::allregistrycomponents_in_this_database_{$fullname} = 1;
 	}
 
-	if ( $isrootmodule ) { $installer::globals::registryrootcomponent = $componentname; }
+	if ( $isrootmodule )
+    {
+        $installer::globals::registryrootcomponent = $componentname;
+    }
 
 	return $componentname;	
 }
@@ -295,25 +314,6 @@ sub get_registry_val64
 	return $value;
 }
 
-##############################################################
-# Returning component for registry table.
-##############################################################
-
-sub get_registry_component
-{
-	my ($registry, $allvariables) = @_;
-
-	# All registry items belonging to one module can
-	# be included into one component
-
-	my $componentname = get_registry_component_name($registry, $allvariables);
-
-	# saving componentname in the registryitem collector
-
-	$registry->{'componentname'} = $componentname;
-
-	return $componentname;
-}
 
 ######################################################
 # Adding the content of 
@@ -356,30 +356,22 @@ sub add_userregs_to_registry_table
 # Content: 
 # Registry Root Key Name Value Component_
 ######################################################
-
-sub create_registry_table
+sub prepare_registry_table ($$$)
 {
-	my ($registryref, $allregistrycomponentsref, $basedir, $languagesarrayref, $allvariableshashref) = @_;
+	my ($registryref, $languagesarrayref, $allvariableshashref) = @_;
 
-	for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
+    my %table_data = ();
+	foreach my $onelanguage (@$languagesarrayref)
 	{
-		my $onelanguage = ${$languagesarrayref}[$m];
-
-		my @registrytable = ();
-		my @reg64table = ();
-	
-		installer::windows::idtglobal::write_idt_header(\@registrytable, "registry");
-		installer::windows::idtglobal::write_idt_header(\@reg64table, "reg64");
-
-		for ( my $i = 0; $i <= $#{$registryref}; $i++ )
+        my $table_items = [];
+		foreach my $oneregistry (@$registryref)
 		{
-			my $oneregistry = ${$registryref}[$i];
-
 			# Controlling the language!
 			# Only language independent folderitems or folderitems with the correct language 
 			# will be included into the table
 			
-			if (! (!(( $oneregistry->{'ismultilingual'} )) || ( $oneregistry->{'specificlanguage'} eq $onelanguage )) )  { next; }
+			next if $oneregistry->{'ismultilingual'}
+                && $oneregistry->{'specificlanguage'} ne $onelanguage;
 
 			my %registry = ();
 
@@ -389,21 +381,24 @@ sub create_registry_table
 			$registry{'Name'} = get_registry_name($oneregistry, $allvariableshashref);
 			$registry{'Value'} = get_registry_value($oneregistry, $allvariableshashref);
 			$registry{'Val64'} = get_registry_val64($oneregistry, $allvariableshashref);
-			$registry{'Component_'} = get_registry_component($oneregistry, $allvariableshashref);	
+            my $component_name = get_registry_component_name($oneregistry, $allvariableshashref);
+            $oneregistry->{'componentname'} = $component_name;
+			$registry{'Component_'} = $component_name;
 	
-			# Collecting all components
-			if (!(installer::existence::exists_in_array($registry{'Component_'}, $allregistrycomponentsref))) 
-			{
-				push(@{$allregistrycomponentsref}, $registry{'Component_'}); 
-			}
-
 			# Collecting all components with DONT_DELETE style
-			my $style = "";
-			if ( $oneregistry->{'Styles'} ) { $style = $oneregistry->{'Styles'}; }
-			if ( $style =~ /\bDONT_DELETE\b/ ) { $installer::globals::dontdeletecomponents{$registry{'Component_'}} = 1; }
+			my $style = $oneregistry->{'Styles'} // "";
+            $registry{'styles'} = $style;
+
+			if ( $style =~ /\bDONT_DELETE\b/ )
+            {
+                $installer::globals::dontdeletecomponents{$component_name} = 1;
+            }
 
 			# Saving upgradekey to write this into setup.ini for minor upgrades
-			if ( $style =~ /\bUPGRADEKEY\b/ ) { $installer::globals::minorupgradekey = $registry{'Key'}; }
+			if ( $style =~ /\bUPGRADEKEY\b/ )
+            {
+                $installer::globals::minorupgradekey = $registry{'Key'};
+            }
 
 			# Collecting all registry components with ALWAYS_REQUIRED style
 			if ( ! ( $style =~ /\bALWAYS_REQUIRED\b/ ))
@@ -423,14 +418,93 @@ sub create_registry_table
 				}
 			}
 
-			my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
-						. $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";
+            push @$table_items, \%registry;
+		}
+        $table_data{$onelanguage} = $table_items;
+    }
+
+    return \%table_data;
+}
+
+
 
-			my $oneline64 = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
-						. $registry{'Name'} . "\t" . $registry{'Val64'} . "\t" . $registry{'Component_'} . "\n";
 
-			if ( ! ( $style =~ /\bX64_ONLY\b/ )) { push(@registrytable, $oneline); }	# standard registry table for 32 Bit 
-			if (( $style =~ /\bX64\b/ ) || ( $style =~ /\bX64_ONLY\b/ )) { push(@reg64table , $oneline64); }
+sub collect_registry_components ($)
+{
+    my ($table_data) = @_;
+
+    my %components = ();
+    foreach my $language_data (values %$table_data)
+    {
+        foreach my $item (@$language_data)
+        {
+			$components{$item->{'Component_'}} = 1; 
+        }
+    }
+    return keys %components;
+}
+
+
+
+
+sub translate_component_names ($$$)
+{
+    my ($translation_map, $registry_items, $table_data) = @_;
+
+    my $replacement_count = 0;
+    foreach my $item (@$registry_items)
+    {
+        my $translated_name = $translation_map->{$item->{'componentname'}};
+        if (defined $translated_name)
+        {
+            $item->{'componentname'} = $translated_name;
+            ++$replacement_count;
+        }
+    }
+    $installer::logger::Lang->printf("replaced %d component names in registry items\n", $replacement_count);
+
+    $replacement_count = 0;
+    foreach my $language_data (values %$table_data)
+    {
+        foreach my $item (@$language_data)
+        {
+            my $translated_name = $translation_map->{$item->{'Component_'}};
+            if (defined $translated_name)
+            {
+                $item->{'Component_'} = $translated_name;
+                ++$replacement_count;
+            }
+        }
+    }
+    $installer::logger::Lang->printf("replaced %d component names in registry table\n", $replacement_count);
+}
+
+
+
+
+sub create_registry_table_32 ($$$$)
+{
+	my ($basedir, $languagesarrayref, $allvariableshashref, $table_data) = @_;
+
+	foreach my $onelanguage (@$languagesarrayref)
+	{
+		my @registrytable = ();
+        installer::windows::idtglobal::write_idt_header(\@registrytable, "registry");
+
+		foreach my $item (@{$table_data->{$onelanguage}})
+		{
+			next if $item->{'styles'} =~ /\bX64_ONLY\b/;
+            
+			my $oneline = join("\t",
+                $item->{'Registry'},
+                $item->{'Root'},
+                $item->{'Key'},
+                $item->{'Name'},
+                $item->{'Value'},
+                $item->{'Component_'})
+                . "\n";
+
+            push(@registrytable, $oneline);
 		}
 
 		# If there are added user registry keys for files collected in
@@ -439,15 +513,47 @@ sub create_registry_table
 		# files in PREDEFINED_OSSHELLNEWDIR, because their component
 		# needs as KeyPath a RegistryItem in HKCU.
 
-		if ( $installer::globals::addeduserregitrykeys ) { add_userregs_to_registry_table(\@registrytable, $allvariableshashref); }
+		if ( $installer::globals::addeduserregitrykeys )
+        {
+            add_userregs_to_registry_table(\@registrytable, $allvariableshashref);
+        }
 
-		# Saving the file
-		
+		# Save the database file.		
 		my $registrytablename = $basedir . $installer::globals::separator . "Registry.idt" . "." . $onelanguage;
 		installer::files::save_file($registrytablename ,\@registrytable);
         $installer::logger::Lang->printf("Created idt file: %s\n", $registrytablename);
+	}
+}
+
+
+
+
+sub create_registry_table_64 ($$$$)
+{
+	my ($basedir, $languagesarrayref, $allvariableshashref, $table_data) = @_;
+
+	foreach my $onelanguage (@$languagesarrayref)
+	{
+        my @reg64table = ();
+		installer::windows::idtglobal::write_idt_header(\@reg64table, "reg64");
+		foreach my $item (@{$table_data->{$onelanguage}})
+        {
+			next unless $item->{'styles'} =~ /\b(X64|X64_ONLY)\b/;
+
+            my $oneline64 = join("\t",
+                $item->{'Registry'},
+                $item->{'Root'},
+                $item->{'Key'},
+                $item->{'Name'},
+                $item->{'Val64'},
+                $item->{'Component_'})
+                . "\n";
+
+            push(@reg64table , $oneline64);
+        }
 
-		$registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
+        # Save the database file.
+		my $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
 		installer::files::save_file($registrytablename ,\@reg64table );
         $installer::logger::Lang->printf("Created idt file: %s\n", $registrytablename);
 	}

Modified: openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/worker.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/worker.pm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/worker.pm (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/worker.pm Wed Dec 18 13:27:09 2013
@@ -733,8 +733,10 @@ 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);
+            $installer::logger::Lang->printf(
+                "Attention: Removing from collector '%s' because it has flag %s\n",
+                $oneitem->{'Name'},
+                $flag);
 			if ( $flag eq "BINARYTABLE_ONLY" ) { push(@installer::globals::binarytableonlyfiles, $oneitem); }
 			next;
 		}
@@ -2270,10 +2272,14 @@ sub get_platform_name
 	{
 		$platformname = "Win32Intel";
 	}
-	elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
+	elsif(( $installer::globals::compiler =~ /^unxmac.i/ ))
 	{
 		$platformname = "MacOSXIntel";
 	}
+	elsif ( $installer::globals::compiler =~ /^unxmaccx/ )
+	{
+		$platformname = "MacOSXX86-64";
+	}
 	elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
 	{
 		$platformname = "MacOSXPowerPC";
@@ -2377,7 +2383,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,10 +2716,10 @@ 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 )))
 		{
 			my $tmpfilename = "cygwinhelper_" . $i . ".txt";
@@ -2728,6 +2733,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 +2745,16 @@ 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);
 			}
 			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/ooxml-osba/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/ziplist.pm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/ziplist.pm Wed Dec 18 13:27:09 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/ooxml-osba/main/solenv/bin/modules/macosxotoolhelper.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/modules/macosxotoolhelper.pm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/modules/macosxotoolhelper.pm (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/modules/macosxotoolhelper.pm Wed Dec 18 13:27:09 2013
@@ -26,6 +26,9 @@ require Exporter;
 our @ISA = Exporter;
 our @EXPORT = otoolD;
 
+use File::Basename;
+$::CC_PATH=(fileparse( $ENV{"CC"}))[1];
+
 sub otoolD($) {
     my ($file) = @_;
     my $call = "otool -D $file";
@@ -39,3 +42,4 @@ sub otoolD($) {
     close(IN);
     return $line;
 }
+

Modified: openoffice/branches/ooxml-osba/main/solenv/bin/release_prepare.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/release_prepare.pl?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/release_prepare.pl (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/release_prepare.pl Wed Dec 18 13:27:09 2013
@@ -32,6 +32,8 @@ use Getopt::Long;
 use Pod::Usage;
 use Digest;
 
+#use Carp::Always;
+
 use strict;
 
 =head1 NAME
@@ -106,9 +108,9 @@ sub ProcessCommandline ()
 
 
 
-sub ProcessLanguage ($$$$)
+sub ProcessLanguage ($$$$$)
 {
-    my ($source_version, $language, $package_format, $product_name) = @_;
+    my ($version, $is_current_version, $language, $package_format, $product_name) = @_;
     
     $installer::logger::Info->printf("%s\n", $language);
     $installer::logger::Info->increase_indentation();
@@ -118,77 +120,12 @@ sub ProcessLanguage ($$$$)
     # 2. unpack it to get access to .cab and .msi
     # 3. unpack .cab so that msimsp.exe can be run
 
-    # Create paths to unpacked contents of .exe and .cab and determine if they exist.
-    # The existence of these paths is taken as flag whether the unpacking has already taken place.
-    my $unpacked_exe_path = installer::patch::InstallationSet::GetUnpackedMsiPath(
-        $source_version,
+    installer::patch::InstallationSet::ProvideUnpackedCab(
+        $version,
+        $is_current_version,
         $language,
         $package_format,
         $product_name);
-    my $unpacked_cab_path = installer::patch::InstallationSet::GetUnpackedCabPath(
-        $source_version,
-        $language,
-        $package_format,
-        $product_name);
-    my $exe_is_unpacked = -d $unpacked_exe_path;
-    my $cab_is_unpacked = -d $unpacked_cab_path;
-
-    if ( ! $exe_is_unpacked)
-    {
-        # Interpret existence of path as proof that the installation
-        # set and the cab file have been successfully unpacked.
-        # Nothing to do.
-        my $filename = installer::patch::InstallationSet::ProvideDownloadSet(
-            $source_version,
-            $language,
-            $package_format);
-        if (defined $filename)
-        {
-            if ( ! -d $unpacked_exe_path)
-            {
-                installer::patch::InstallationSet::UnpackExe($filename, $unpacked_exe_path);
-            }
-        }
-        else
-        {
-            installer::logger::PrintError("could not provide .exe installation set at '%s'\n", $filename);
-        }
-    }
-    else
-    {
-        $installer::logger::Info->printf("downloadable installation set has already been unpacked to '%s'\n",
-            $unpacked_exe_path);
-    }
-
-    if ( ! $cab_is_unpacked)
-    {
-        my $cab_filename = File::Spec->catfile($unpacked_exe_path, "openoffice1.cab");
-        if ( ! -f $cab_filename)
-        {
-             # Cab file does not exist.
-            installer::logger::PrintError(
-                "could not find .cab file at '%s'.  Extraction of .exe seems to have failed.\n",
-                $cab_filename);
-        }
-
-        # Unpack the cab file.
-        my $msi = new installer::patch::Msi(
-            $source_version,
-            $language,
-            $product_name);
-
-        $installer::logger::Info->printf("unpacking cab file '%s' to '%s'\n",
-            $cab_filename, $unpacked_cab_path);
-        installer::patch::InstallationSet::UnpackCab(
-            $cab_filename,
-            $msi,
-            $unpacked_cab_path);
-    }
-    else
-    {
-        $installer::logger::Info->printf("cab has already been unpacked to\n");
-        $installer::logger::Info->printf("    %s\n", $unpacked_cab_path);
-    }
 
     $installer::logger::Info->decrease_indentation();
 }
@@ -196,31 +133,53 @@ sub ProcessLanguage ($$$$)
 
 
 
-installer::logger::SetupSimpleLogging("c:/tmp/log");
+sub main ()
+{
+    installer::logger::SetupSimpleLogging();
 
-my $arguments = ProcessCommandline();
-$arguments->{'package-format'} = 'msi';
+    my $arguments = ProcessCommandline();
+    $arguments->{'package-format'} = 'msi';
 
-print "preparing release build\n";
-my ($variables, undef, undef)
-    = installer::ziplist::read_openoffice_lst_file(
+    $installer::logger::Info->print("preparing release build\n");
+    my ($variables, undef, undef)
+        = installer::ziplist::read_openoffice_lst_file(
         $arguments->{'lst-file'},
         $arguments->{'product-name'},
         undef);
-if ( ! defined $arguments->{'source-version'})
-{
-    $arguments->{'source-version'} = $variables->{'PREVIOUS_VERSION'};
+    if ( ! defined $arguments->{'source-version'})
+    {
+        $arguments->{'source-version'} = $variables->{'PREVIOUS_VERSION'};
+        if ( ! defined $arguments->{'source-version'})
+        {
+            $arguments->{'source-version'} = installer::patch::ReleasesList::GetPreviousVersion(
+                $variables->{'PRODUCTVERSION'});
+            if ( ! defined $arguments->{'source-version'})
+            {
+                $installer::logger::Info->printf("ERROR: can not autodetect previous version\n");
+                $installer::logger::Info->printf("       please specify via 'PREVIOUS_VERSION' in %s\n",
+                    $arguments->{'lst-file'});
+                $installer::logger::Info->printf("       or the --source-version commandline option\n");
+                exit(1);
+            }
+        }
+    }
+    my $current_version = $variables->{'PRODUCTVERSION'};
+    $installer::logger::Info->printf("data from '%s'\n", $arguments->{'lst-file'});
+    $installer::logger::Info->printf("name is '%s'\n", $arguments->{'product-name'});
+    $installer::logger::Info->printf("path is '%s'\n", $arguments->{'output-path'});
+    $installer::logger::Info->printf("source version is '%s'\n", $arguments->{'source-version'});
+    $installer::logger::Info->printf("target version is '%s'\n", $current_version);
+
+    foreach my $language (@{$arguments->{'languages'}})
+    {
+        ProcessLanguage(
+            $arguments->{'source-version'},
+            $arguments->{'source-version'} eq $current_version,
+            $language,
+            $arguments->{'package-format'},
+            $arguments->{'product-name'});
+    }
 }
-$installer::logger::Info->printf("    reading data from '%s'\n", $arguments->{'lst-file'});
-$installer::logger::Info->printf("    product name is '%s'\n", $arguments->{'product-name'});
-$installer::logger::Info->printf("    output path is '%s'\n", $arguments->{'output-path'});
-$installer::logger::Info->printf("    source version is '%s'\n", $arguments->{'source-version'});
 
-foreach my $language (@{$arguments->{'languages'}})
-{
-    ProcessLanguage(
-        $arguments->{'source-version'},
-        $language,
-        $arguments->{'package-format'},
-        $arguments->{'product-name'});
-}
+
+main();

Modified: openoffice/branches/ooxml-osba/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/srcrelease.xml?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/srcrelease.xml Wed Dec 18 13:27:09 2013
@@ -32,7 +32,7 @@
   <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
   <property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
   <property name="includes.mk" value="inc/unxmac*.mk inc/unxlng*.mk inc/wntmsci*.mk inc/unxsol*.mk" />
-  <property name="excludes.outdirs" value="**/unxmacx*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
+  <property name="excludes.outdirs" value="**/unxmac*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
   
   
   <target name="getrevision">

Modified: openoffice/branches/ooxml-osba/main/solenv/bin/update_module_ignore_lists.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/update_module_ignore_lists.pl?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/update_module_ignore_lists.pl (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/update_module_ignore_lists.pl Wed Dec 18 13:27:09 2013
@@ -44,6 +44,9 @@ my @platforms = (
         "unxsoli4",
         "wntmsci12",
         "unxmacxi",
+        "unxmacxp",
+        "unxmacci",
+        "unxmaccx",
         "unxubit8",
         "unxaixp",
         "unxbsda",
@@ -70,7 +73,6 @@ my @platforms = (
         "unxlngs390x",
         "unxlngs",
         "unxlnxi",
-        "unxmacxp",
         "unxsogi",
         "unxsogs"
     );

Modified: openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk Wed Dec 18 13:27:09 2013
@@ -23,6 +23,8 @@
 
 GUI := UNX
 COM := GCC
+#COM := S5ABI
+#COMID := s5abi
 
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.

Modified: openoffice/branches/ooxml-osba/main/solenv/inc/_tg_app.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/inc/_tg_app.mk?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/inc/_tg_app.mk (original)
+++ openoffice/branches/ooxml-osba/main/solenv/inc/_tg_app.mk Wed Dec 18 13:27:09 2013
@@ -18,6 +18,9 @@
 #  under the License.
 #  
 # *************************************************************
+
+CC_PATH*=""
+
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
@@ -117,8 +120,8 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP1RPATH) $@
@@ -377,8 +380,8 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP2RPATH) $@
@@ -637,8 +640,8 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP3RPATH) $@
@@ -897,8 +900,8 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP4RPATH) $@
@@ -1157,8 +1160,8 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP5RPATH) $@
@@ -1417,8 +1420,8 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP6RPATH) $@
@@ -1677,8 +1680,8 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP7RPATH) $@
@@ -1937,8 +1940,8 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP8RPATH) $@
@@ -2197,8 +2200,8 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) 
 	@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP9RPATH) $@
@@ -2457,8 +2460,8 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
 	@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP10RPATH) $@

Modified: openoffice/branches/ooxml-osba/main/solenv/inc/tg_app.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/inc/tg_app.mk?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/inc/tg_app.mk (original)
+++ openoffice/branches/ooxml-osba/main/solenv/inc/tg_app.mk Wed Dec 18 13:27:09 2013
@@ -19,7 +19,7 @@
 #  
 #**************************************************************
 
-
+CC_PATH*=""
 
 #######################################################
 # instructions for linking
@@ -122,8 +122,8 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(
 	@+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-	@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-	@strip -i -R $(MISC)/$(@:b).strip -X $@
+	@-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+	@$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
 	@ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP$(TNR)RPATH) $@

Modified: openoffice/branches/ooxml-osba/main/solenv/inc/tg_compv.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/inc/tg_compv.mk?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/inc/tg_compv.mk (original)
+++ openoffice/branches/ooxml-osba/main/solenv/inc/tg_compv.mk Wed Dec 18 13:27:09 2013
@@ -129,6 +129,11 @@ COMID=C730
 COMNAME=MipsPro
 .ENDIF
 
+.IF "$(COM)"=="CLANG"
+COMID=s5abi
+COMNAME=s5abi
+.ENDIF
+
 .IF "$(COMNAME)"==""
 
 # "EXCEPTIONSFILES" get compiled before this, but shouldn't

Modified: openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_map?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_map (original)
+++ openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_map Wed Dec 18 13:27:09 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/ooxml-osba/main/stlport/systemstl/hash_set
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_set?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_set (original)
+++ openoffice/branches/ooxml-osba/main/stlport/systemstl/hash_set Wed Dec 18 13:27:09 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/ooxml-osba/main/svl/inc/svl/smplhint.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svl/inc/svl/smplhint.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svl/inc/svl/smplhint.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svl/inc/svl/smplhint.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svl/source/items/whassert.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svl/source/items/whassert.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svl/source/items/whassert.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svl/source/items/whassert.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svl/source/notify/smplhint.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svl/source/notify/smplhint.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svl/source/notify/smplhint.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svl/source/notify/smplhint.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/accessibleruler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/accessibleruler.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/accessibleruler.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/accessibleruler.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/headbar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/headbar.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/headbar.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/headbar.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/ruler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/ruler.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/ruler.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/ruler.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/svlbitm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svlbitm.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svlbitm.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svlbitm.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/svlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svlbox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svlbox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svlbox.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/svtools.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svtools.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svtools.hrc (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svtools.hrc Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/svtreebx.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svtreebx.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svtreebx.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/svtreebx.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/inc/svtools/texteng.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/inc/svtools/texteng.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/inc/svtools/texteng.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/inc/svtools/texteng.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/source/brwbox/brwbox3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/brwbox/brwbox3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/brwbox/brwbox3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/brwbox/brwbox3.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/svtools/source/brwbox/editbrowsebox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/brwbox/editbrowsebox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/brwbox/editbrowsebox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/brwbox/editbrowsebox.cxx Wed Dec 18 13:27:09 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()
 					);
                 }

Modified: openoffice/branches/ooxml-osba/main/svtools/source/contnr/imivctl1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/contnr/imivctl1.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/contnr/imivctl1.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/contnr/imivctl1.cxx Wed Dec 18 13:27:09 2013
@@ -1180,9 +1180,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_I
 		{
 			SelectEntry( pCursor, sal_True, sal_True,  sal_False, bPaintSync );
 			aCurSelectionRect = GetEntryBoundRect( pCursor );
-			//IAccessibility2 Implementation 2009-----
 			CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
-			//-----IAccessibility2 Implementation 2009
 		}
 	}
 }

Modified: openoffice/branches/ooxml-osba/main/svtools/source/contnr/svimpbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/contnr/svimpbox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/contnr/svimpbox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/contnr/svimpbox.cxx Wed Dec 18 13:27:09 2013
@@ -300,9 +300,7 @@ void SvImpLBox::Clear()
 	// #97680# ---------
 	aContextBmpWidthVector.clear();
 
-//IAccessibility2 Implementation 2009-----
 	CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED, NULL );
-//-----IAccessibility2 Implementation 2009
 }
 
 // *********************************************************************
@@ -650,9 +648,7 @@ void SvImpLBox::SetCursor( SvLBoxEntry* 
 		if(!bForceNoSelect && bSimpleTravel && !(nFlags & F_DESEL_ALL) && GetUpdateMode())
 		{
 			pView->Select( pCursor, sal_True );
-			//IAccessibility2 Implementation 2009-----
 			CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor );
-			//-----IAccessibility2 Implementation 2009
 		}
 		// Mehrfachselektion: Im Cursor-Move selektieren, wenn
 		// nicht im Add-Mode (Ctrl-F8)
@@ -662,19 +658,15 @@ void SvImpLBox::SetCursor( SvLBoxEntry* 
 				 !bForceNoSelect )
 		{
 			pView->Select( pCursor, sal_True );
-			//IAccessibility2 Implementation 2009-----
 			CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor );
-			//-----IAccessibility2 Implementation 2009
 		}
 		else
 		{
 			ShowCursor( sal_True );
-			//IAccessibility2 Implementation 2009-----
 			if (bForceNoSelect && GetUpdateMode())
 			{
 				CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor);
 			}
-			//-----IAccessibility2 Implementation 2009
 		}
 
 		if( pAnchor )
@@ -1716,9 +1708,7 @@ void SvImpLBox::EntrySelected( SvLBoxEnt
 
 void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
 {
-	//IAccessibility2 Implementation 2009-----
 	CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED , pEntry );
-	//-----IAccessibility2 Implementation 2009
 
 	DestroyAnchor();
 
@@ -2379,10 +2369,8 @@ sal_Bool SvImpLBox::KeyInput( const KeyE
 
 		case KEY_LEFT:
 		{
-            //IAccessibility2 Implementation 2009-----
             // if ( bIsCellFocusEnabled )
             if ( bIsCellFocusEnabled && pCursor )
-			//-----IAccessibility2 Implementation 2009
             {
                 if ( nCurTabPos > FIRST_ENTRY_TAB )
                 {

Modified: openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtabbx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtabbx.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtabbx.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtabbx.cxx Wed Dec 18 13:27:09 2013
@@ -1182,10 +1182,8 @@ void SvHeaderTabListBox::FillAccessibleS
 			sal_uInt16 nCurColumn = GetCurrColumn();
 			if ( IsCellVisible( nCurRow, nCurColumn ) )
 				_rStateSet.AddState( AccessibleStateType::VISIBLE );
-			//IAccessibility2 Implementation 2009-----
 			if ( IsEnabled() )
 				_rStateSet.AddState( AccessibleStateType::ENABLED );
-			//-----IAccessibility2 Implementation 2009
 			_rStateSet.AddState( AccessibleStateType::TRANSIENT );
 			break;
 		}
@@ -1196,10 +1194,8 @@ void SvHeaderTabListBox::FillAccessibleS
 			_rStateSet.AddState( AccessibleStateType::VISIBLE );
 			_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 			_rStateSet.AddState( AccessibleStateType::TRANSIENT );
-			//IAccessibility2 Implementation 2009-----
 			if ( IsEnabled() )
 				_rStateSet.AddState( AccessibleStateType::ENABLED );
-			//-----IAccessibility2 Implementation 2009
 			break;
 		}
         default:
@@ -1224,7 +1220,6 @@ void SvHeaderTabListBox::FillAccessibleS
 		_rStateSet.AddState( AccessibleStateType::ACTIVE );
 		_rStateSet.AddState( AccessibleStateType::SELECTED );
 	}
-	//IAccessibility2 Implementation 2009-----
 	if ( IsEnabled() )
 		_rStateSet.AddState( AccessibleStateType::ENABLED );
 }

Modified: openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtreebx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtreebx.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtreebx.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/contnr/svtreebx.cxx Wed Dec 18 13:27:09 2013
@@ -346,7 +346,6 @@ String SvTreeListBox::GetEntryText(SvLBo
 	return pItem->GetText();
 }
 
-//IAccessibility2 Implementation 2009-----
 String  SvTreeListBox::GetEntryAltText( SvLBoxEntry* ) const
 {
 	String tmp;
@@ -428,7 +427,6 @@ String SvTreeListBox::SearchEntryTextWit
 		sRet = sRet.Erase(sRet.Len() - 1);
 	return sRet;
 }
-//-----IAccessibility2 Implementation 2009
 String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const
 {
 	DBG_CHKTHIS(SvTreeListBox,0);
@@ -890,18 +888,15 @@ void SvTreeListBox::RequestingChilds( Sv
 void SvTreeListBox::GetFocus()
 {
 	DBG_CHKTHIS(SvTreeListBox,0);
-	//IAccessibility2 Implementation 2009-----
 	//Solution:If there is no item in the tree,draw focus.
 	if( !SvLBox::First())
 	{
 		Invalidate();
 	}
-	//-----IAccessibility2 Implementation 2009
 	pImp->GetFocus();
 	SvLBox::GetFocus();
 
 	SvLBoxEntry* pEntry = FirstSelected();
-	//IAccessibility2 Implementation 2009-----
 	if ( !pEntry )
 	{
 		pEntry = pImp->GetCurrentEntry();
@@ -911,24 +906,19 @@ void SvTreeListBox::GetFocus()
 		if (pEntry != pImp->pCursor)
 			pEntry = pImp->pCursor;
 	}
-	//IAccessibility2 Implementation 2009-----
 	if ( pEntry )
-		//pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
 		pImp->CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pEntry );
-	//-----IAccessibility2 Implementation 2009
 
 }
 
 void SvTreeListBox::LoseFocus()
 {
 	DBG_CHKTHIS(SvTreeListBox,0);
-	//IAccessibility2 Implementation 2009-----
 	//Solution:If there is no item in the tree,delete visual focus.
 	if( !SvLBox::First())
 	{
 		Invalidate();
 	}
-	//-----IAccessibility2 Implementation 2009
 	pImp->LoseFocus();
 	SvLBox::LoseFocus();
 }
@@ -1175,7 +1165,6 @@ sal_Bool SvTreeListBox::Select( SvLBoxEn
 		if( bSelect )
 		{
 			SelectHdl();
-			// IA2 CWS
 			// pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
 			CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, pEntry);			
 		}
@@ -1298,7 +1287,6 @@ void SvTreeListBox::Paint( const Rectang
 	if( nTreeFlags & TREEFLAG_RECALCTABS )
 		SetTabs();
 	pImp->Paint( rRect );
-	//IAccessibility2 Implementation 2009-----
 	//Solution:Add visual focus draw
 	if( !SvLBox::First() )
 	{
@@ -1315,7 +1303,6 @@ void SvTreeListBox::Paint( const Rectang
 			HideFocus();
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 }
 
 void SvTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
@@ -2775,14 +2762,6 @@ void SvTreeListBox::FillAccessibleEntryS
 		rStateSet.AddState( AccessibleStateType::EXPANDABLE );
 		if ( IsExpanded( pEntry ) )
 		    rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
-		// IA2 CWS
-		/*
-		else
-		{
-			// MT: COLLAPSE == EXPANDABLE & !EXPANDED
-			rStateSet.AddState( (sal_Int16)AccessibleStateType::COLLAPSE );
-		}
-		*/
 	}
 
 	if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
@@ -2791,7 +2770,6 @@ void SvTreeListBox::FillAccessibleEntryS
 		rStateSet.AddState( AccessibleStateType::VISIBLE );
 	if ( IsSelected( pEntry ) )
 		rStateSet.AddState( AccessibleStateType::SELECTED );
-	//IAccessibility2 Implementation 2009-----
 	if ( IsEnabled() )
 	{
 		rStateSet.AddState( AccessibleStateType::ENABLED );
@@ -2805,7 +2783,6 @@ void SvTreeListBox::FillAccessibleEntryS
 				rStateSet.AddState( AccessibleStateType::FOCUSED );
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 }
 
 Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry )

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/accessibleruler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/accessibleruler.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/accessibleruler.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/accessibleruler.cxx Wed Dec 18 13:27:09 2013
@@ -494,11 +494,9 @@ Rectangle SvtRulerAccessible::GetBoundin
 	::osl::MutexGuard	aGuard( m_aMutex );
 
 	ThrowExceptionIfNotAlive();
-//IAccessibility2 Implementation 2009-----
 	//the absolute on screen pixel is wrong
 	//return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
 	return Rectangle( mpRepr->GetParent()->OutputToAbsoluteScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
-//-----IAccessibility2 Implementation 2009
 }
 
 Rectangle SvtRulerAccessible::GetBoundingBox( void ) throw( RuntimeException )

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/headbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/headbar.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/headbar.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/headbar.cxx Wed Dec 18 13:27:09 2013
@@ -42,10 +42,8 @@
 #endif
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <vclxaccessibleheaderbar.hxx>
-//-----IAccessibility2 Implementation 2009
 // =======================================================================
 
 struct ImplHeadItem
@@ -99,9 +97,7 @@ void HeaderBar::ImplInit( WinBits nWinSt
 	mbOutDrag		= sal_False;
 	mbItemMode		= sal_False;
 
-	//IAccessibility2 Implementation 2009-----
 	m_pVCLXHeaderBar = NULL;
-	//-----IAccessibility2 Implementation 2009
 	// StyleBits auswerten
 	if ( nWinStyle & WB_DRAG )
 		mbDragable = sal_True;
@@ -123,9 +119,7 @@ void HeaderBar::ImplInit( WinBits nWinSt
 	}
 
 	ImplInitSettings( sal_True, sal_True, sal_True );
-	//IAccessibility2 Implementation 2009-----
 	//SetAccessibleRole(com::sun::star::accessibility::AccessibleRole::COLUMN_HEADER);	
-	//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------
@@ -1655,7 +1649,6 @@ void HeaderBar::SetAccessible( ::com::su
     mxAccessible = _xAccessible;
 }
 
-//IAccessibility2 Implementation 2009-----
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > HeaderBar::GetComponentInterface( sal_Bool bCreate )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer 
@@ -1670,5 +1663,4 @@ void HeaderBar::SetAccessible( ::com::su
 	else
 		return xPeer;
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/ruler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/ruler.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/ruler.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/ruler.cxx Wed Dec 18 13:27:09 2013
@@ -32,7 +32,6 @@
 
 #define _SV_RULER_CXX
 #include <svtools/ruler.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
 using namespace	::rtl;
@@ -40,7 +39,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
-//-----IAccessibility2 Implementation 2009
 // =======================================================================
 
 #define RULER_OFF           3
@@ -307,10 +305,8 @@ void Ruler::ImplInit( WinBits nWinBits )
     else
         aDefSize.Width() = nDefHeight;
     SetOutputSizePixel( aDefSize );
-	//IAccessibility2 Implementation 2009-----
 	SetType(WINDOW_RULER);
 	pAccContext = NULL; 
-	//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------
@@ -334,10 +330,8 @@ Ruler::~Ruler()
         Application::RemoveUserEvent( mnUpdateEvtId );
     delete mpSaveData;
     delete mpDragData;
-	//IAccessibility2 Implementation 2009-----
 	if( pAccContext )
 		pAccContext->release();
-	//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------
@@ -3194,7 +3188,6 @@ const RulerBorder*  Ruler::GetBorders() 
 sal_uInt16              Ruler::GetIndentCount() const { return mpData->nIndents; }
 const RulerIndent*  Ruler::GetIndents() const { return mpData->pIndents; }
 
-//IAccessibility2 Implementation 2009-----
 uno::Reference< XAccessible > Ruler::CreateAccessible()
 {
 	Window*						pParent = GetAccessibleParentWindow();
@@ -3221,4 +3214,3 @@ uno::Reference< XAccessible > Ruler::Cre
 	else
 		return uno::Reference< XAccessible >();
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/valueacc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/valueacc.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/valueacc.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/valueacc.cxx Wed Dec 18 13:27:09 2013
@@ -34,7 +34,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
@@ -42,7 +41,6 @@
 #ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
 #include <unotools/accessiblerelationsethelper.hxx>
 #endif
-//-----IAccessibility2 Implementation 2009
 using namespace ::com::sun::star;
 
 // ----------------
@@ -339,7 +337,6 @@ uno::Reference< accessibility::XAccessib
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-//IAccessibility2 Implementation 2009-----
 	uno::Reference< accessibility::XAccessibleRelationSet > xRelSet;
 	Window* pWindow = (Window*)mpParent;
 	if ( pWindow )
@@ -364,7 +361,6 @@ uno::Reference< accessibility::XAccessib
 		}
 	}
     return xRelSet;
-//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------------
@@ -792,10 +788,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_
             nIndex -= 1;
     }
     if (pItem == NULL)
-//IAccessibility2 Implementation 2009-----
-        //pItem = mpParent->ImplGetVisibleItem (static_cast<sal_uInt16>(nIndex));
 	pItem = mpParent->ImplGetItem (static_cast<sal_uInt16>(nIndex));
-//-----IAccessibility2 Implementation 2009
 
     return pItem;
 }
@@ -979,10 +972,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce
             // just in case the number of children changes in the mean time.
             try
             {
-//IAccessibility2 Implementation 2009-----
-                //pItem = mpParent->mrParent.ImplGetVisibleItem (i);
                 pItem = mpParent->mrParent.ImplGetItem(i);
-//-----IAccessibility2 Implementation 2009
             }
             catch (lang::IndexOutOfBoundsException aException)
             {
@@ -999,7 +989,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce
         }
     }
 
-//IAccessibility2 Implementation 2009-----
 	//if this valueset contain a none field(common value is default), then we should increase the real index and set the noitem index value equal 0.
 	if ( mpParent && ( (mpParent->mrParent.GetStyle() & WB_NONEFIELD) != 0 ) )
 	{
@@ -1009,7 +998,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce
 		else
 			nIndexInParent++;
 	}
-//-----IAccessibility2 Implementation 2009
     return nIndexInParent;
 }
 

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/valueimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/valueimp.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/valueimp.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/valueimp.hxx Wed Dec 18 13:27:09 2013
@@ -87,9 +87,7 @@ struct ValueSetItem
 	XubString			maText;
 	void*				mpData;
 	Rectangle			maRect;
-	//IAccessibility2 Implementation 2009-----
 	sal_Bool				bSelected:1;
-	//-----IAccessibility2 Implementation 2009
 	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
 
     ValueSetItem( ValueSet& rParent );

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/valueset.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/valueset.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/valueset.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/valueset.cxx Wed Dec 18 13:27:09 2013
@@ -1220,7 +1220,6 @@ sal_uInt16 ValueSet::ImplGetVisibleItemC
         ValueSetItem* pItem = mpImpl->mpItemList->GetObject( n );
 
 		//IAccessible2 implementation - also count empty rectangles as visible...
-        // if( pItem->meType != VALUESETITEM_SPACE && !pItem->maRect.IsEmpty() )
 		if( pItem->meType != VALUESETITEM_SPACE )
             nRet++;
     }
@@ -1907,7 +1906,6 @@ void ValueSet::InsertItem( sal_uInt16 nI
 		Invalidate();
 }
 
-//IAccessibility2 Implementation 2009-----
 //method to set accessible when the style is user draw.
 void ValueSet::InsertItem( sal_uInt16 nItemId, const XubString& rText, sal_uInt16 nPos	)
 {
@@ -1923,7 +1921,6 @@ void ValueSet::InsertItem( sal_uInt16 nI
 	if ( IsReallyVisible() && IsUpdateMode() )
 		Invalidate();
 }
-//-----IAccessibility2 Implementation 2009
 
 // -----------------------------------------------------------------------
 
@@ -2799,7 +2796,6 @@ void ValueSet::SetEdgeBlending(bool bNew
         }
     }
 }
-//IAccessibility2 Implementation 2009-----
 //For sending out the focused event on the first focused item when this valueset is first focused.
 // MT: Focus notifications changed in DEV300 meanwhile, so this is not used for now.
 // Just keeping it here for reference, in case something in out implementation doesn't work as expected...
@@ -2851,7 +2847,6 @@ void ValueSet::SetFocusedItem(sal_Bool b
 }
 */
 //end
-//-----IAccessibility2 Implementation 2009
 
 
 // -----------------------------------------------------------------------

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbar.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbar.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbar.cxx Wed Dec 18 13:27:09 2013
@@ -19,7 +19,6 @@
  * 
  *************************************************************/
 
-//IAccessibility2 Implementation 2009-----
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
@@ -190,4 +189,3 @@ void SAL_CALL VCLXAccessibleHeaderBar::d
 	}
     return xChild;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx Wed Dec 18 13:27:09 2013
@@ -19,7 +19,6 @@
  * 
  *************************************************************/
 
-//IAccessibility2 Implementation 2009-----
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
@@ -400,4 +399,3 @@ Reference< awt::XFont > VCLXAccessibleHe
 
 	return sText;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/ooxml-osba/main/svtools/source/edit/svmedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/edit/svmedit.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/edit/svmedit.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/edit/svmedit.cxx Wed Dec 18 13:27:09 2013
@@ -941,9 +941,7 @@ void TextWindow::Command( const CommandE
 
 void TextWindow::GetFocus()
 {
-//IAccessibility2 Implementation 2009-----
 	//Window::GetFocus();
-//-----IAccessibility2 Implementation 2009
 	if ( !mbActivePopup )
 	{
 		sal_Bool bGotoCursor = !mpExtTextView->IsReadOnly();
@@ -1250,10 +1248,8 @@ void MultiLineEdit::GetFocus()
 {
     if ( !pImpSvMEdit )  // might be called from within the dtor, when pImpSvMEdit == NULL is a valid state
         return;
-	//IAccessibility2 Implementation 2009-----
 	//Disable the focused event on scroll pane
 	//Edit::GetFocus();
-	//-----IAccessibility2 Implementation 2009
     pImpSvMEdit->GetFocus();
 }
 

Modified: openoffice/branches/ooxml-osba/main/svtools/source/edit/texteng.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/edit/texteng.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/edit/texteng.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/edit/texteng.cxx Wed Dec 18 13:27:09 2013
@@ -803,7 +803,7 @@ TextPaM TextEngine::ImpInsertText( sal_U
                         ++nChgPos;
 
                     xub_StrLen nChgLen = static_cast< xub_StrLen >(nNewLen - nChgPos);
-                    String aChgText( aNewText.copy( nChgPos ), nChgLen );
+                    String aChgText( aNewText.copy( nChgPos ).getStr(), nChgLen );
 
                     // select text from first pos to be changed to current pos
                     TextSelection aSel( TextPaM( aPaM.GetPara(), (sal_uInt16) nChgPos ), aPaM );

Modified: openoffice/branches/ooxml-osba/main/svtools/source/inc/filectrl.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/inc/filectrl.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/inc/filectrl.hrc (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/inc/filectrl.hrc Wed Dec 18 13:27:09 2013
@@ -26,12 +26,10 @@
 
 #define STR_FILECTRL_BUTTONTEXT		333		// ID-Range?!
 
-//IAccessibility2 Implementation 2009-----
 #define  STR_TABBAR_PUSHBUTTON_MOVET0HOME  ( STR_FILECTRL_BUTTONTEXT+ 1)
 #define  STR_TABBAR_PUSHBUTTON_MOVELEFT       ( STR_FILECTRL_BUTTONTEXT+ 2)
 #define  STR_TABBAR_PUSHBUTTON_MOVERIGHT     ( STR_FILECTRL_BUTTONTEXT+ 3)
 #define  STR_TABBAR_PUSHBUTTON_MOVETOEND    ( STR_FILECTRL_BUTTONTEXT+ 4)
-//-----IAccessibility2 Implementation 2009
 
 #endif
 

Modified: openoffice/branches/ooxml-osba/main/svtools/source/misc/acceleratorexecute.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/misc/acceleratorexecute.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/misc/acceleratorexecute.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/misc/acceleratorexecute.cxx Wed Dec 18 13:27:09 2013
@@ -72,9 +72,7 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <comphelper/uieventslogger.hxx>
-//-----IAccessibility2 Implementation 2009
 
 //===============================================
 // namespace
@@ -252,7 +250,6 @@ sal_Bool AcceleratorExecute::execute(con
     sal_Bool bRet = xDispatch.is();
     if ( bRet )
     {
-//IAccessibility2 Implementation 2009-----
         if(::comphelper::UiEventsLogger::isEnabled() && m_xSMGR.is() && m_xDispatcher.is()) //#i88653#
         {
             try
@@ -269,7 +266,6 @@ sal_Bool AcceleratorExecute::execute(con
             catch(const css::uno::Exception&)
                 { }
         }
-//-----IAccessibility2 Implementation 2009
         // Note: Such instance can be used one times only and destroy itself afterwards .-)
         AsyncAccelExec* pExec = AsyncAccelExec::createOnShotInstance(xDispatch, aURL);
         pExec->execAsync();



Mime
View raw message