Merge commit 'ooo/OOO330_m12'
This commit is contained in:
commit
fdced3a36c
2 changed files with 3 additions and 2 deletions
|
@ -112,7 +112,7 @@ sub makenumber
|
||||||
$h = shift;
|
$h = shift;
|
||||||
# 1 2 3 4
|
# 1 2 3 4
|
||||||
# 1234567890123456789012345678901234567890
|
# 1234567890123456789012345678901234567890
|
||||||
$symbols="0123456789abcdefghijklmnopqrstuvwxyz+-<=>";
|
$symbols="0123456789abcdefghijklmnopqrstuvwxyz+-[=]";
|
||||||
$order = length($symbols);
|
$order = length($symbols);
|
||||||
$result = "";
|
$result = "";
|
||||||
while ( length( $result ) < 6 )
|
while ( length( $result ) < 6 )
|
||||||
|
|
|
@ -175,8 +175,9 @@ sub splitfile{
|
||||||
exit( -1 );
|
exit( -1 );
|
||||||
}
|
}
|
||||||
my $src_root = $ENV{SOURCE_ROOT_DIR};
|
my $src_root = $ENV{SOURCE_ROOT_DIR};
|
||||||
|
my $ooo_src_root = $ENV{SRC_ROOT};
|
||||||
my $so_l10n_path = $src_root."/sun/l10n_so/source";
|
my $so_l10n_path = $src_root."/sun/l10n_so/source";
|
||||||
my $ooo_l10n_path = $src_root."/ooo/l10n/source";
|
my $ooo_l10n_path = $ooo_src_root."/l10n/source";
|
||||||
|
|
||||||
#print "$so_l10n_path\n";
|
#print "$so_l10n_path\n";
|
||||||
#print "$ooo_l10n_path\n";
|
#print "$ooo_l10n_path\n";
|
||||||
|
|
Loading…
Reference in a new issue