[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source solenv/bin svx/source
Tsutomu Uchino
hanya at apache.org
Mon Jan 20 02:09:23 PST 2014
sc/source/ui/src/scfuncs.src | 2 -
solenv/bin/modules/installer/download.pm | 15 +++++---
solenv/bin/modules/installer/windows/component.pm | 37 +++++++++++-----------
solenv/bin/modules/installer/windows/directory.pm | 3 +
solenv/bin/modules/installer/windows/feature.pm | 3 +
solenv/bin/modules/installer/windows/msiglobal.pm | 3 +
solenv/bin/modules/installer/windows/registry.pm | 6 ++-
svx/source/sidebar/area/AreaPropertyPanel.src | 2 -
8 files changed, 41 insertions(+), 30 deletions(-)
New commits:
commit 6e2c0fef5906a0b48384b21fda6f63e7485ce00d
Author: Tsutomu Uchino <hanya at apache.org>
Date: Mon Jan 20 09:55:08 2014 +0000
#i56998# add space before percent character in text and quick help
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d54afd6..f4116f8 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5448,7 +5448,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50 %, 3 = 75 %, 4 =MAX)." ;
+ Text [ en-US ] = "The type of the quartile (0 = MIN, 1 = 25 %, 2 = 50 %, 3 = 75 %, 4 = MAX)." ;
};
};
// -=*# Resource for function KGRÖSSTE #*=-
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index dba3cfe..5d31457 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -285,7 +285,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
Border = TRUE ;
Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ;
- QuickHelpText [ en-US ] = "Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100 % is fully transparent." ;
+ QuickHelpText [ en-US ] = "Enter a transparency value for the beginning point of the gradient, where 0 % is fully opaque and 100 % is fully transparent." ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
commit 9d2066ac820a3b4ecf84d591d19c8b8d2bdecdd8
Author: Andre Fischer <af at apache.org>
Date: Mon Jan 20 09:00:29 2014 +0000
Fixed build breaker: Perl operator // not defined on all systems.
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index de73339..5cf45c2 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -829,13 +829,16 @@ sub resolve_variables_in_downloadname
# Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
- my $productversion = $allvariables->{'PRODUCTVERSION'} // "";
+ my $productversion = $allvariables->{'PRODUCTVERSION'};
+ $productversion = "" unless defined $productversion;
$downloadname =~ s/\{productversion\}/$productversion/;
- my $packageversion = $allvariables->{'PACKAGEVERSION'} // "";
+ my $packageversion = $allvariables->{'PACKAGEVERSION'};
+ $packageversion = "" unless defined $packageversion;
$downloadname =~ s/\{packageversion\}/$packageversion/;
- my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'} // "";
+ my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'};
+ $extension = "" unless defined $extension;
$extension = lc($extension);
$downloadname =~ s/\{extension\}/$extension/;
@@ -1049,7 +1052,8 @@ sub put_publisher_into_template ($$)
{
my ($templatefile, $variables) = @_;
- my $publisher = $variables->{'OOOVENDOR'} // "";
+ my $publisher = $variables->{'OOOVENDOR'};
+ $publisher = "" unless defined $publisher;
replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher);
}
@@ -1062,7 +1066,8 @@ sub put_website_into_template ($$)
{
my ($templatefile, $variables) = @_;
- my $website = $variables->{'STARTCENTER_INFO_URL'} // "";
+ my $website = $variables->{'STARTCENTER_INFO_URL'};
+ $website = "" unless defined $website;
replace_one_variable($templatefile, "WEBSITEPLACEHOLDER", $website);
}
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 0383852..4f75fac 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -104,11 +104,12 @@ sub get_file_component_directory_for_file ($$)
{
my ($onefile, $dirref) = @_;
- my $localstyles = $onefile->{'Styles'} // "";
+ my $localstyles = $onefile->{'Styles'};
+ $localstyles = "" unless defined $localstyles;
if ( $localstyles =~ /\bFONT\b/ ) # special handling for font files
{
- return $installer::globals::fontsfolder;
+ return $installer::globals::fontsfolder;
}
my $destdir = "";
@@ -117,7 +118,7 @@ sub get_file_component_directory_for_file ($$)
if ( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) # special handling for shellnew files
{
- return $installer::globals::templatefolder;
+ return $installer::globals::templatefolder;
}
my $destination = $onefile->{'destination'};
@@ -131,32 +132,32 @@ sub get_file_component_directory_for_file ($$)
my $uniquedir = undef;
if ($destination eq "") # files in the installation root
{
- $uniquedir = "INSTALLLOCATION";
+ $uniquedir = "INSTALLLOCATION";
}
else
{
- my $found = 0;
+ my $found = 0;
foreach my $directory (@$dirref)
+ {
+ if ($directory->{'HostName'} eq $destination)
{
- if ($directory->{'HostName'} eq $destination)
- {
- $found = 1;
+ $found = 1;
$uniquedir = $directory->{'uniquename'};
- last;
- }
+ last;
}
+ }
- if ( ! $found)
- {
- installer::exiter::exit_program(
+ if ( ! $found)
+ {
+ installer::exiter::exit_program(
"ERROR: Did not find destination $destination in directory collection",
"get_file_component_directory");
- }
+ }
- if ( $uniquedir eq $installer::globals::officeinstalldirectory )
- {
- $uniquedir = "INSTALLLOCATION";
- }
+ if ( $uniquedir eq $installer::globals::officeinstalldirectory )
+ {
+ $uniquedir = "INSTALLLOCATION";
+ }
}
$onefile->{'uniquedirname'} = $uniquedir; # saving it in the file collection
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index c62f50c..18d036a 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -366,7 +366,8 @@ sub create_unique_directorynames ($)
{
next if defined $directory->{'uniquename'};
- my $styles = $directory->{'Styles'} // "";
+ my $styles = $directory->{'Styles'};
+ $styles = "" unless defined $styles;
my ($originaluniquename, $uniquename) = get_unique_name(
$directory->{'HostName'},
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index d2a1aa4..d7979dd 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -372,7 +372,8 @@ sub prepare_feature_table ($$$)
foreach my $onefeature (@$modules)
{
# Java and Ada only, if the correct settings are set
- my $styles = $onefeature->{'Styles'} // "";
+ my $styles = $onefeature->{'Styles'};
+ $styles = "" unless defined $styles;
if (( $styles =~ /\bJAVAMODULE\b/ ) && ( ! ($variables->{'JAVAPRODUCT'} ))) { next; }
# Controlling the language!
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 57c06fc..3604a9b 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -169,7 +169,8 @@ sub generate_cab_file_list ($$$$)
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
foreach my $onefile (@sorted_files)
{
- my $styles = $onefile->{'Styles'} // "";
+ my $styles = $onefile->{'Styles'};
+ $styles = "" unless defined $styles;
if ($styles =~ /\bDONT_PACK\b/)
{
$installer::logger::Lang->printf(" excluding '%s' from ddf\n", $onefile->{'uniquename'});
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 1352d28..94f4e96 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -84,7 +84,8 @@ sub get_registry_component_name
# 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"} // "";
+ my $version = $allvariables->{"BRANDPACKAGEVERSION"};
+ $version = "" unless defined $version;
$addon .= $version;
$addon = lc($addon);
$addon =~ s/ //g;
@@ -386,7 +387,8 @@ sub prepare_registry_table ($$$)
$registry{'Component_'} = $component_name;
# Collecting all components with DONT_DELETE style
- my $style = $oneregistry->{'Styles'} // "";
+ my $style = $oneregistry->{'Styles'};
+ $style = "" unless defined $style;
$registry{'styles'} = $style;
if ( $style =~ /\bDONT_DELETE\b/ )
More information about the Libreoffice-commits
mailing list