This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 353566969a Fixed typo (alreay -> already) and some other
353566969a is described below
commit 353566969a66957f00012e88c396ae18ac1cc883
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Feb 3 20:48:10 2025 +0100
Fixed typo (alreay -> already) and some other
---
main/basegfx/qa/mkpolygons.pl | 35 ++++---
main/slideshow/qa/tools/mkeffects.pl | 151 +++++++++++++++----------------
main/slideshow/qa/tools/mktransitions.pl | 106 +++++++++++-----------
main/svtools/source/misc/langtab.cxx | 71 +++++++--------
4 files changed, 175 insertions(+), 188 deletions(-)
diff --git a/main/basegfx/qa/mkpolygons.pl b/main/basegfx/qa/mkpolygons.pl
index e32fc3db16..2e172bf72c 100644
--- a/main/basegfx/qa/mkpolygons.pl
+++ b/main/basegfx/qa/mkpolygons.pl
@@ -1,8 +1,8 @@
:
eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
+ if 0;
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -10,16 +10,16 @@ eval 'exec perl -wS $0 ${1+"$@"}'
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
#
@@ -51,19 +51,19 @@ $TempDir = "";
sub open_file
{
my $filename = pop @_;
-
- # Create base directory of temporary directory tree if not alreay
+
+ # Create base directory of temporary directory tree if not already
# present.
if ($TempDir eq "")
{
$TempDir = File::Temp::tempdir (CLEANUP => 1);
}
-
+
# Create the path to the file.
my $fullname = File::Spec->catfile ($TempDir, $filename);
my ($volume,$directories,$file) = File::Spec->splitpath ($fullname);
mkpath (File::Spec->catpath ($volume,$directories,""));
-
+
# Open the file and return a file handle to it.
return new IO::File ($fullname, "w");
}
@@ -75,13 +75,13 @@ sub open_file
sub zip_dirtree
{
my $filename = pop @_;
-
+
my $cwd = getcwd;
my $zip_name = $filename;
-
+
# We are about to change the directory.
# Therefore create an absolute pathname for the zip archive.
-
+
# First transfer the drive from $cwd to $zip_name. This is a
# workaround for a bug in file_name_is_absolute which thinks
# the path \bla is an absolute path under DOS.
@@ -89,16 +89,16 @@ sub zip_dirtree
my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath ($cwd);
$volume = $volume_cwd if ($volume eq "");
$zip_name = File::Spec->catpath ($volume,$directories,$file);
-
+
# Add the current working directory to a relative path.
if ( ! file_name_is_absolute ($zip_name))
{
$zip_name = File::Spec->catfile ($cwd, $zip_name);
-
+
# Try everything to clean up the name.
$zip_name = File::Spec->rel2abs ($filename);
$zip_name = File::Spec->canonpath ($zip_name);
-
+
# Remove .. directories from the middle of the path.
while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//)
{
@@ -117,7 +117,7 @@ sub zip_dirtree
return;
}
}
-
+
# Finally create the zip file. First change into the temporary directory
# so that the resulting zip file contains only paths relative to it.
print "zipping [$ZipCmd $ZipFlags $zip_name *]\n";
@@ -293,7 +293,7 @@ sub process_command_line
exit 0;
}
}
-
+
$global_output_name = "polygons.odp";
my $j = 0, $noMoreOptions = 0;
for (my $i=0; $i<$#ARGV; $i++)
@@ -358,4 +358,3 @@ writeFooter();
$OUT->close;
zip_dirtree ($global_output_name);
-
diff --git a/main/slideshow/qa/tools/mkeffects.pl
b/main/slideshow/qa/tools/mkeffects.pl
index a4e68b767e..cbae6b1535 100755
--- a/main/slideshow/qa/tools/mkeffects.pl
+++ b/main/slideshow/qa/tools/mkeffects.pl
@@ -1,8 +1,8 @@
:
eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
+ if 0;
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -10,19 +10,18 @@ eval 'exec perl -wS $0 ${1+"$@"}'
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
-
use IO::File;
use Cwd;
use File::Spec;
@@ -32,11 +31,9 @@ use File::Path;
$TempDir = "";
-
# all the XML package generation is a blatant rip from AF's
# write-calc-doc.pl
-
###############################################################################
# Open a file with the given name.
# First it is checked if the temporary directory, in which all files for
@@ -47,37 +44,36 @@ $TempDir = "";
sub open_file
{
my $filename = pop @_;
-
- # Create base directory of temporary directory tree if not alreay
+
+ # Create base directory of temporary directory tree if not already
# present.
if ($TempDir eq "")
{
$TempDir = File::Temp::tempdir (CLEANUP => 1);
}
-
+
# Create the path to the file.
my $fullname = File::Spec->catfile ($TempDir, $filename);
my ($volume,$directories,$file) = File::Spec->splitpath ($fullname);
mkpath (File::Spec->catpath ($volume,$directories,""));
-
+
# Open the file and return a file handle to it.
return new IO::File ($fullname, "w");
}
-
###############################################################################
# Zip the files in the directory tree into the given file.
#
sub zip_dirtree
{
my $filename = pop @_;
-
+
my $cwd = getcwd;
my $zip_name = $filename;
-
+
# We are about to change the directory.
# Therefore create an absolute pathname for the zip archive.
-
+
# First transfer the drive from $cwd to $zip_name. This is a
# workaround for a bug in file_name_is_absolute which thinks
# the path \bla is an absolute path under DOS.
@@ -85,16 +81,16 @@ sub zip_dirtree
my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath
($cwd);
$volume = $volume_cwd if ($volume eq "");
$zip_name = File::Spec->catpath ($volume,$directories,$file);
-
+
# Add the current working directory to a relative path.
if ( ! file_name_is_absolute ($zip_name))
{
$zip_name = File::Spec->catfile ($cwd, $zip_name);
-
+
# Try everything to clean up the name.
$zip_name = File::Spec->rel2abs ($filename);
$zip_name = File::Spec->canonpath ($zip_name);
-
+
# Remove .. directories from the middle of the path.
while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//)
{
@@ -113,7 +109,7 @@ sub zip_dirtree
return;
}
}
-
+
# Finally create the zip file. First change into the temporary
directory
# so that the resulting zip file contains only paths relative to
it.
print "zipping [$ZipCmd $ZipFlags $zip_name *]\n";
@@ -240,10 +236,10 @@ sub writeTransitionAnimation
print $OUT " <anim:par smil:begin=\"0s\"
smil:fill=\"remove\">\n";
print $OUT " <anim:set smil:begin=\"0s\" smil:dur=\"0.001s\"
smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:transitionFilter smil:dur=\"1s\"
smil:targetElement=\"textid$slideNum\" smil:type=\"$transitionType\"
smil:subtype=\"$transitionSubtype\"/>\n";
+ print $OUT " <anim:transitionFilter smil:dur=\"1s\"
smil:targetElement=\"textid$slideNum\" smil:type=\"$transitionType\"
smil:subtype=\"$transitionSubtype\"/>\n";
print $OUT " <anim:set smil:begin=\"0.3s\"
smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:transitionFilter smil:begin=\"0.3s\"
smil:dur=\"1s\" smil:targetElement=\"id$slideNum\"
smil:type=\"$transitionType\" smil:subtype=\"$transitionSubtype\"/>\n";
- print $OUT " </anim:par>\n";
+ print $OUT " <anim:transitionFilter smil:begin=\"0.3s\"
smil:dur=\"1s\" smil:targetElement=\"id$slideNum\"
smil:type=\"$transitionType\" smil:subtype=\"$transitionSubtype\"/>\n";
+ print $OUT " </anim:par>\n";
}
sub writePropertyAnimation
@@ -255,10 +251,10 @@ sub writePropertyAnimation
print $OUT " <anim:par smil:begin=\"0s\" smil:dur=\"3s\"
smil:fill=\"remove\">\n";
print $OUT " <anim:set smil:begin=\"0s\" smil:dur=\"0.001s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:animate smil:begin=\"0s\" smil:dur=\"1s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
smil:attributeName=\"$propertyName\"
smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\"
presentation:additive=\"base\"/>\n";
+ print $OUT " <anim:animate smil:begin=\"0s\" smil:dur=\"1s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
smil:attributeName=\"$propertyName\"
smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\"
presentation:additive=\"base\"/>\n";
print $OUT " <anim:set smil:begin=\"0.6s\"
smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:animate smil:begin=\"0.6s\" smil:dur=\"1s\"
smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
smil:attributeName=\"$propertyName\"
smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\"
presentation:additive=\"base\"/>\n";
- print $OUT " </anim:par>\n";
+ print $OUT " <anim:animate smil:begin=\"0.6s\"
smil:dur=\"1s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
smil:attributeName=\"$propertyName\"
smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\"
presentation:additive=\"base\"/>\n";
+ print $OUT " </anim:par>\n";
}
sub writeTransformAnimation
@@ -269,10 +265,10 @@ sub writeTransformAnimation
print $OUT " <anim:par smil:begin=\"0s\" smil:dur=\"3s\"
smil:fill=\"remove\">\n";
print $OUT " <anim:set smil:begin=\"0s\" smil:dur=\"0.001s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:animateTransform smil:begin=\"0s\"
smil:dur=\"1s\" smil:targetElement=\"id$slideNum\" smil:fill=\"hold\"
smil:by=\"$propertyBy\" presentation:additive=\"base\"
svg:type=\"$propertyName\"/>\n";
+ print $OUT " <anim:animateTransform smil:begin=\"0s\"
smil:dur=\"1s\" smil:targetElement=\"id$slideNum\" smil:fill=\"hold\"
smil:by=\"$propertyBy\" presentation:additive=\"base\"
svg:type=\"$propertyName\"/>\n";
print $OUT " <anim:set smil:begin=\"0.6s\"
smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:animateTransform smil:begin=\"0.6s\"
smil:dur=\"1s\" smil:targetElement=\"textid$slideNum\" smil:fill=\"hold\"
smil:by=\"$propertyBy\" presentation:additive=\"base\"
svg:type=\"$propertyName\"/>\n";
- print $OUT " </anim:par>\n";
+ print $OUT " <anim:animateTransform smil:begin=\"0.6s\"
smil:dur=\"1s\" smil:targetElement=\"textid$slideNum\" smil:fill=\"hold\"
smil:by=\"$propertyBy\" presentation:additive=\"base\"
svg:type=\"$propertyName\"/>\n";
+ print $OUT " </anim:par>\n";
}
sub writePathMotionAnimation
@@ -281,10 +277,10 @@ sub writePathMotionAnimation
print $OUT " <anim:par smil:begin=\"0s\" smil:dur=\"10s\"
smil:fill=\"remove\">\n";
print $OUT " <anim:set smil:begin=\"0s\" smil:dur=\"0.001s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:animateMotion smil:dur=\"5s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
presentation:additive=\"base\" svg:path=\"m0.0 0.07658c0.0098-0.00493
0.00197-0.00985 0.00295-0.01478 0.00191 0.00 0.00383 0.00 0.00574 0.00-0.00005
0.00033-0.00011 0.00065-0.00016 0.00098-0.00034 0.00276-0.00060 0.00446-0.00077
0.00512-0.00021 0.00086-0.00031 0.00143-0.00031 0.00170 0.00 0.00200 0.00150
0.00369 0.00452 0.00507 0.00301 0.00138 0.00671 0.00206 0.01108 0.00 [...]
+ print $OUT " <anim:animateMotion smil:dur=\"5s\"
smil:fill=\"hold\" smil:targetElement=\"id$slideNum\"
presentation:additive=\"base\" svg:path=\"m0.0 0.07658c0.0098-0.00493
0.00197-0.00985 0.00295-0.01478 0.00191 0.00 0.00383 0.00 0.00574 0.00-0.00005
0.00033-0.00011 0.00065-0.00016 0.00098-0.00034 0.00276-0.00060 0.00446-0.00077
0.00512-0.00021 0.00086-0.00031 0.00143-0.00031 0.00170 0.00 0.00200 0.00150
0.00369 0.00452 0.00507 0.00301 0.00138 0.00671 0.00206 0.01108 0.00206 [...]
print $OUT " <anim:set smil:begin=\"3.6s\"
smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n";
- print $OUT " <anim:animateMotion smil:begin=\"3.6s\"
smil:dur=\"5s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
presentation:additive=\"base\" svg:path=\"m0.0 0.07658c0.0098-0.00493
0.00197-0.00985 0.00295-0.01478 0.00191 0.00 0.00383 0.00 0.00574 0.00-0.00005
0.00033-0.00011 0.00065-0.00016 0.00098-0.00034 0.00276-0.00060 0.00446-0.00077
0.00512-0.00021 0.00086-0.00031 0.00143-0.00031 0.00170 0.00 0.00200 0.00150
0.00369 0.00452 0.00507 0.00301 0.00138 0.00 [...]
- print $OUT " </anim:par>\n";
+ print $OUT " <anim:animateMotion smil:begin=\"3.6s\"
smil:dur=\"5s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\"
presentation:additive=\"base\" svg:path=\"m0.0 0.07658c0.0098-0.00493
0.00197-0.00985 0.00295-0.01478 0.00191 0.00 0.00383 0.00 0.00574 0.00-0.00005
0.00033-0.00011 0.00065-0.00016 0.00098-0.00034 0.00276-0.00060 0.00446-0.00077
0.00512-0.00021 0.00086-0.00031 0.00143-0.00031 0.00170 0.00 0.00200 0.00150
0.00369 0.00452 0.00507 0.00301 0.00138 0.00671 [...]
+ print $OUT " </anim:par>\n";
}
sub writeManifest
@@ -332,7 +328,7 @@ sub process_command_line
exit 0;
}
}
-
+
$global_gen_all=0;
$global_output_name = "alltransitions.odp";
@@ -351,7 +347,7 @@ sub process_command_line
}
elsif ($#ARGV == $i )
{
- $global_output_name = $ARGV[$i];
+ $global_output_name = $ARGV[$i];
}
}
@@ -361,41 +357,41 @@ sub process_command_line
$transitionsRef = [
["barWipe",
- ["leftToRight",
+ ["leftToRight",
"topToBottom"]],
["blindsWipe",
- ["vertical",
+ ["vertical",
"horizontal"]],
-
+
["boxWipe",
- ["topLeft",
- "topRight",
- "bottomRight",
- "bottomLeft",
- "topCenter",
- "rightCenter",
- "bottomCenter",
- "leftCenter"]],
+ ["topLeft",
+ "topRight",
+ "bottomRight",
+ "bottomLeft",
+ "topCenter",
+ "rightCenter",
+ "bottomCenter",
+ "leftCenter"]],
["fourBoxWipe",
- ["cornersIn",
+ ["cornersIn",
"cornersOut"]],
["barnDoorWipe",
- ["vertical",
- "horizontal",
- "diagonalBottomLeft",
- "diagonalTopLeft"]],
+ ["vertical",
+ "horizontal",
+ "diagonalBottomLeft",
+ "diagonalTopLeft"]],
["bowTieWipe",
- ["vertical",
- "horizontal"]],
-
+ ["vertical",
+ "horizontal"]],
+
["miscDiagonalWipe",
["doubleBarnDoor",
"doubleDiamond"]],
-
+
["veeWipe",
["down",
"left",
@@ -415,11 +411,11 @@ $transitionsRef = [
["barnZigZagWipe",
["vertical",
"horizontal"]],
-
+
["irisWipe",
["rectangle",
"diamond"]],
-
+
["triangleWipe",
["up",
"right",
@@ -431,11 +427,11 @@ $transitionsRef = [
"right",
"down",
"left"]],
-
+
["pentagonWipe",
["up",
"down"]],
-
+
["hexagonWipe",
["horizontal",
"vertical"]],
@@ -457,7 +453,7 @@ $transitionsRef = [
["fourPoint",
"fivePoint",
"sixPoint"]],
-
+
["miscShapeWipe",
["heart",
"keyhole"]],
@@ -467,7 +463,7 @@ $transitionsRef = [
"clockwiseThree",
"clockwiseSix",
"clockwiseNine"]],
-
+
["pinWheelWipe",
["oneBlade",
"twoBladeVertical",
@@ -499,7 +495,7 @@ $transitionsRef = [
"fanOutHorizontal",
"fanInVertical",
"fanInHorizontal"]],
-
+
["doubleSweepWipe",
["parallelVertical",
"parallelDiagonal",
@@ -507,7 +503,7 @@ $transitionsRef = [
"oppositeHorizontal",
"parallelDiagonalTopLeft",
"parallelDiagonalBottomLeft"]],
-
+
["saloonDoorWipe",
["top",
"left",
@@ -527,7 +523,7 @@ $transitionsRef = [
"topRightDiagonal",
"bottomRightDiagonal",
"bottomLeftDiagonal"]],
-
+
["spiralWipe",
["topLeftClockwise",
"topRightClockwise",
@@ -537,7 +533,7 @@ $transitionsRef = [
"topRightCounterClockwise",
"bottomRightCounterClockwise",
"bottomLeftCounterClockwise"]],
-
+
["parallelSnakesWipe",
["verticalTopSame",
"verticalBottomSame",
@@ -549,7 +545,7 @@ $transitionsRef = [
"horizontalTopRightOpposite",
"diagonalBottomLeftOpposite",
"diagonalTopLeftOpposite"]],
-
+
["boxSnakesWipe",
["twoBoxTop",
"twoBoxLeft",
@@ -563,7 +559,7 @@ $transitionsRef = [
"horizontalLeft",
"horizontalRight"]],
- ["pushWipe",
+ ["pushWipe",
["fromLeft",
"fromTop",
"fromRight",
@@ -639,7 +635,7 @@ $propertiesRef = [
[ "value", "y", "y-0.1", "y+0.1" ]
];
-$transformsRef = [
+$transformsRef = [
["translate", "0.5*width,0.5*height"],
["scale", "0.5*width,0.5*height"],
["rotate", "270"],
@@ -739,23 +735,23 @@ writeSlideFooter();
<anim:par smil:begin="0s" smil:fill="remove">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:targetElement="textid10001" smil:attributeName="visibility"
smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold"
smil:targetElement="textid10001" smil:accelerate="0.5" smil:attributeName="x"
smil:by="0.3" presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold"
smil:targetElement="textid10001" smil:accelerate="0.5" smil:attributeName="x"
smil:by="0.3" presentation:additive="base"/>
</anim:par>
<anim:par smil:begin="0s" smil:fill="remove">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:targetElement="textid10002" smil:attributeName="visibility"
smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold"
smil:targetElement="textid10002" smil:decelerate="0.5" smil:attributeName="x"
smil:by="0.3" presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold"
smil:targetElement="textid10002" smil:decelerate="0.5" smil:attributeName="x"
smil:by="0.3" presentation:additive="base"/>
</anim:par>
<anim:par smil:begin="0s" smil:fill="remove">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:targetElement="textid10003" smil:attributeName="visibility"
smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold"
smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3"
presentation:additive="sum"/>
- <anim:animate smil:begin="0s" smil:dur="6s" smil:fill="hold"
smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3"
presentation:additive="sum"/>
+ <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold"
smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3"
presentation:additive="sum"/>
+ <anim:animate smil:begin="0s" smil:dur="6s" smil:fill="hold"
smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3"
presentation:additive="sum"/>
</anim:par>
<anim:par smil:begin="0s" smil:fill="remove">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:targetElement="textid10004" smil:attributeName="visibility"
smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="5s" smil:fill="hold"
smil:targetElement="textid10004" smil:attributeName="y" smil:from="0.3"
smil:to="0.8" smil:autoReverse="true" presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="5s" smil:fill="hold"
smil:targetElement="textid10004" smil:attributeName="y" smil:from="0.3"
smil:to="0.8" smil:autoReverse="true" presentation:additive="base"/>
</anim:par>
<anim:par smil:begin="0s" smil:fill="remove">
@@ -770,7 +766,7 @@ writeSlideFooter();
<anim:par smil:begin="0s" smil:fill="remove">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:targetElement="textid10007" smil:attributeName="visibility"
smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold"
smil:targetElement="textid10007" smil:attributeName="y" smil:values="0;1"
smil:keyTimes="0;1" anim:formula="y+0.3*height*sin(5*pi*\$)"
presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold"
smil:targetElement="textid10007" smil:attributeName="y" smil:values="0;1"
smil:keyTimes="0;1" anim:formula="y+0.3*height*sin(5*pi*\$)"
presentation:additive="base"/>
</anim:par>
~;
@@ -784,7 +780,7 @@ writeSlideFooter();
<draw:rect draw:style-name="gr1" draw:text-style-name="P1"
draw:id="id20000" draw:layer="layout" svg:width="17.5cm" svg:height="13cm"
svg:x="5cm" svg:y="4cm">
<text:p text:style-name="P2">Slide: 5</text:p>
<text:p text:style-name="P2">Topic: Text effects</text:p>
- <text:p text:id="textid20001" text:style-name="P2">Some text to show
iterated single paragraph</text:p>
+ <text:p text:id="textid20001" text:style-name="P2">Some text to show
iterated single paragraph</text:p>
<text:p text:id="textid20002" text:style-name="P2">Some text to show
iterated word-by-word effects</text:p>
<text:p text:id="textid20003" text:style-name="P2">Some text to show
iterated letter-by-letter effects</text:p>
<text:p text:id="textid20004" text:style-name="P2">Some more
text</text:p>
@@ -799,7 +795,7 @@ writeSlideFooter();
<anim:par smil:begin="0s" smil:fill="remove">
<anim:iterate smil:begin="0s" smil:fill="hold"
smil:targetElement="id20000" anim:iterate-type="by-paragraph"
anim:iterate-interval="0.2s">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:attributeName="visibility" smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold"
smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x"
presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold"
smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x"
presentation:additive="base"/>
</anim:iterate>
</anim:par>
@@ -807,7 +803,7 @@ writeSlideFooter();
<anim:set smil:begin="0s" smil:dur="0.001s"
smil:targetElement="id20000" smil:fill="hold" smil:attributeName="visibility"
smil:to="visible"/>
<anim:iterate smil:begin="0s" smil:fill="hold"
smil:targetElement="textid20002" anim:iterate-type="by-word"
anim:iterate-interval="0.2s">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:attributeName="visibility" smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold"
smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x"
presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold"
smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x"
presentation:additive="base"/>
</anim:iterate>
</anim:par>
@@ -815,7 +811,7 @@ writeSlideFooter();
<anim:set smil:begin="0s" smil:dur="0.001s"
smil:targetElement="id20000" smil:fill="hold" smil:attributeName="visibility"
smil:to="visible"/>
<anim:iterate smil:begin="0s" smil:fill="hold"
smil:targetElement="textid20003" anim:iterate-type="by-letter"
anim:iterate-interval="0.2s">
<anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold"
smil:attributeName="visibility" smil:to="visible"/>
- <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold"
smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x"
presentation:additive="base"/>
+ <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold"
smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x"
presentation:additive="base"/>
</anim:iterate>
</anim:par>
~;
@@ -827,4 +823,3 @@ writeFooter();
$OUT->close;
zip_dirtree ($global_output_name);
-
diff --git a/main/slideshow/qa/tools/mktransitions.pl
b/main/slideshow/qa/tools/mktransitions.pl
index 063b4d29de..ecc2537b74 100644
--- a/main/slideshow/qa/tools/mktransitions.pl
+++ b/main/slideshow/qa/tools/mktransitions.pl
@@ -1,8 +1,8 @@
:
eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
+ if 0;
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -10,19 +10,18 @@ eval 'exec perl -wS $0 ${1+"$@"}'
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
-
use IO::File;
use Cwd;
use File::Spec;
@@ -34,11 +33,9 @@ $TempDir = "";
my $FirstTransitionIndex = 0;
my $LastTransitionIndex = -1;
-
# all the XML package generation is a blatant rip from AF's
# write-calc-doc.pl
-
###############################################################################
# Open a file with the given name.
# First it is checked if the temporary directory, in which all files for
@@ -49,19 +46,19 @@ my $LastTransitionIndex = -1;
sub open_file
{
my $filename = pop @_;
-
- # Create base directory of temporary directory tree if not alreay
+
+ # Create base directory of temporary directory tree if not already
# present.
if ($TempDir eq "")
{
$TempDir = File::Temp::tempdir (CLEANUP => 1);
}
-
+
# Create the path to the file.
my $fullname = File::Spec->catfile ($TempDir, $filename);
my ($volume,$directories,$file) = File::Spec->splitpath ($fullname);
mkpath (File::Spec->catpath ($volume,$directories,""));
-
+
# Open the file and return a file handle to it.
return new IO::File ($fullname, "w");
}
@@ -73,13 +70,13 @@ sub open_file
sub zip_dirtree
{
my $filename = pop @_;
-
+
my $cwd = getcwd;
my $zip_name = $filename;
-
+
# We are about to change the directory.
# Therefore create an absolute pathname for the zip archive.
-
+
# First transfer the drive from $cwd to $zip_name. This is a
# workaround for a bug in file_name_is_absolute which thinks
# the path \bla is an absolute path under DOS.
@@ -87,16 +84,16 @@ sub zip_dirtree
my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath
($cwd);
$volume = $volume_cwd if ($volume eq "");
$zip_name = File::Spec->catpath ($volume,$directories,$file);
-
+
# Add the current working directory to a relative path.
if ( ! file_name_is_absolute ($zip_name))
{
$zip_name = File::Spec->catfile ($cwd, $zip_name);
-
+
# Try everything to clean up the name.
$zip_name = File::Spec->rel2abs ($filename);
$zip_name = File::Spec->canonpath ($zip_name);
-
+
# Remove .. directories from the middle of the path.
while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//)
{
@@ -115,14 +112,14 @@ sub zip_dirtree
return;
}
}
-
+
# Finally create the zip file. First change into the temporary
directory
# so that the resulting zip file contains only paths relative to
it.
print "zipping [$ZipCmd $ZipFlags $zip_name *]\n";
chdir ($TempDir);
system ("$ZipCmd $ZipFlags $zip_name *");
chdir ($cwd);
-
+
}
@@ -221,7 +218,7 @@ sub writeSlide
my $transitionType = pop @_;
my $slideNum = pop @_;
- return if $slideNum<$FirstTransitionIndex || ($LastTransitionIndex>=0 &&
$slideNum>$LastTransitionIndex);
+ return if $slideNum<$FirstTransitionIndex || ($LastTransitionIndex>=0
&& $slideNum>$LastTransitionIndex);
print $OUT " <draw:page draw:name=\"page",$slideNum,"\"
draw:style-name=\"dp",$slideNum,"\" draw:master-page-name=\"Default\"
presentation:presentation-page-layout-name=\"AL1T19\">";
@@ -305,41 +302,41 @@ sub writeManifest
$transitionsRef = [
["barWipe",
- ["leftToRight",
+ ["leftToRight",
"topToBottom"]],
["blindsWipe",
- ["vertical",
+ ["vertical",
"horizontal"]],
-
+
["boxWipe",
- ["topLeft",
- "topRight",
- "bottomRight",
- "bottomLeft",
- "topCenter",
- "rightCenter",
- "bottomCenter",
- "leftCenter"]],
+ ["topLeft",
+ "topRight",
+ "bottomRight",
+ "bottomLeft",
+ "topCenter",
+ "rightCenter",
+ "bottomCenter",
+ "leftCenter"]],
["fourBoxWipe",
- ["cornersIn",
+ ["cornersIn",
"cornersOut"]],
["barnDoorWipe",
- ["vertical",
- "horizontal",
- "diagonalBottomLeft",
- "diagonalTopLeft"]],
+ ["vertical",
+ "horizontal",
+ "diagonalBottomLeft",
+ "diagonalTopLeft"]],
["bowTieWipe",
- ["vertical",
- "horizontal"]],
-
+ ["vertical",
+ "horizontal"]],
+
["miscDiagonalWipe",
["doubleBarnDoor",
"doubleDiamond"]],
-
+
["veeWipe",
["down",
"left",
@@ -359,11 +356,11 @@ $transitionsRef = [
["barnZigZagWipe",
["vertical",
"horizontal"]],
-
+
["irisWipe",
["rectangle",
"diamond"]],
-
+
["triangleWipe",
["up",
"right",
@@ -375,11 +372,11 @@ $transitionsRef = [
"right",
"down",
"left"]],
-
+
["pentagonWipe",
["up",
"down"]],
-
+
["hexagonWipe",
["horizontal",
"vertical"]],
@@ -401,7 +398,7 @@ $transitionsRef = [
["fourPoint",
"fivePoint",
"sixPoint"]],
-
+
["miscShapeWipe",
["heart",
"keyhole"]],
@@ -411,7 +408,7 @@ $transitionsRef = [
"clockwiseThree",
"clockwiseSix",
"clockwiseNine"]],
-
+
["pinWheelWipe",
["oneBlade",
"twoBladeVertical",
@@ -443,7 +440,7 @@ $transitionsRef = [
"fanOutHorizontal",
"fanInVertical",
"fanInHorizontal"]],
-
+
["doubleSweepWipe",
["parallelVertical",
"parallelDiagonal",
@@ -451,7 +448,7 @@ $transitionsRef = [
"oppositeHorizontal",
"parallelDiagonalTopLeft",
"parallelDiagonalBottomLeft"]],
-
+
["saloonDoorWipe",
["top",
"left",
@@ -471,7 +468,7 @@ $transitionsRef = [
"topRightDiagonal",
"bottomRightDiagonal",
"bottomLeftDiagonal"]],
-
+
["spiralWipe",
["topLeftClockwise",
"topRightClockwise",
@@ -481,7 +478,7 @@ $transitionsRef = [
"topRightCounterClockwise",
"bottomRightCounterClockwise",
"bottomLeftCounterClockwise"]],
-
+
["parallelSnakesWipe",
["verticalTopSame",
"verticalBottomSame",
@@ -493,7 +490,7 @@ $transitionsRef = [
"horizontalTopRightOpposite",
"diagonalBottomLeftOpposite",
"diagonalTopLeftOpposite"]],
-
+
["boxSnakesWipe",
["twoBoxTop",
"twoBoxLeft",
@@ -579,7 +576,7 @@ sub process_command_line
exit 0;
}
}
-
+
$global_gen_all=0;
$global_output_name = "alltransitions.odp";
@@ -606,7 +603,7 @@ sub process_command_line
}
elsif ($#ARGV == $i )
{
- $global_output_name = $ARGV[$i];
+ $global_output_name = $ARGV[$i];
}
}
@@ -714,4 +711,3 @@ writeFooter();
$OUT->close;
zip_dirtree ($global_output_name);
-
diff --git a/main/svtools/source/misc/langtab.cxx
b/main/svtools/source/misc/langtab.cxx
index 0df94f2de8..73c554998a 100644
--- a/main/svtools/source/misc/langtab.cxx
+++ b/main/svtools/source/misc/langtab.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
@@ -50,24 +48,24 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const
String &rText )
const sal_uInt16 nLen = rText.Len();
if (nLen == 0)
return String();
-
+
const sal_Unicode cLRE_Embedding = 0x202A; // the start char of an
LRE embedding
const sal_Unicode cRLE_Embedding = 0x202B; // the start char of an
RLE embedding
const sal_Unicode cPopDirectionalFormat = 0x202C; // the unicode PDF
(POP_DIRECTIONAL_FORMAT) char that terminates an LRE/RLE embedding
-
- // check if there are alreay embedding characters at the strings start
+
+ // check if there are already embedding characters at the strings start
// if so change nothing
const sal_Unicode cChar = rText.GetBuffer()[0];
if (cChar == cLRE_Embedding || cChar == cRLE_Embedding)
return rText;
-
+
// since we only call the function getCharacterDirection
// it does not matter which locale the CharClass is for.
// Thus we can readily make use of SvtSysLocale::GetCharClass()
// which should come at no cost...
SvtSysLocale aSysLocale;
const CharClass &rCharClass = aSysLocale.GetCharClass();
-
+
// we should look for the first non-neutral LTR or RTL character
// and use that to determine the embedding of the whole text...
// Thus we can avoid to check every character of the text.
@@ -85,30 +83,30 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const
String &rText )
case i18n::DirectionProperty_ARABIC_NUMBER : // yes! arabic
numbers are written from left to right
{
bIsRtlText = false;
- bFound = true;
+ bFound = true;
break;
}
-
+
case i18n::DirectionProperty_RIGHT_TO_LEFT :
case i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC :
case i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING :
case i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE :
- {
+ {
bIsRtlText = true;
- bFound = true;
+ bFound = true;
break;
}
-
+
default:
{
// nothing to be done, character is considered to be neutral
we need to look further ...
- }
- }
+ }
+ }
}
-
- sal_Unicode cStart = cLRE_Embedding; // default is to use LRE embedding
characters
+
+ sal_Unicode cStart = cLRE_Embedding; // default is to use LRE embedding
characters
if (bIsRtlText)
- cStart = cRLE_Embedding; // then use RLE embedding
+ cStart = cRLE_Embedding; // then use RLE embedding
// add embedding start and end chars to the text if the direction could be
determined
String aRes( rText );
@@ -119,7 +117,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const
String &rText )
}
return aRes;
-}
+}
//------------------------------------------------------------------------
@@ -138,30 +136,30 @@ SvtLanguageTable::~SvtLanguageTable()
const String& SvtLanguageTable::GetString( const LanguageType eType ) const
{
- LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType);
- sal_uInt32 nPos = FindIndex( eLang );
+ LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage(
eType);
+ sal_uInt32 nPos = FindIndex( eLang );
if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
return ResStringArray::GetString( nPos );
else
{
- // If we knew what a simple "en" should alias to (en_US?) we could
- // generally raise an error.
- OSL_ENSURE(
- eLang == LANGUAGE_ENGLISH, "language entry not found in resource"
);
-
- nPos = FindIndex( LANGUAGE_DONTKNOW );
+ // If we knew what a simple "en" should alias to (en_US?) we
could
+ // generally raise an error.
+ OSL_ENSURE(
+ eLang == LANGUAGE_ENGLISH, "language entry not found in
resource" );
+
+ nPos = FindIndex( LANGUAGE_DONTKNOW );
if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
return ResStringArray::GetString( nPos );
}
- static String aEmptyStr;
- return aEmptyStr;
+ static String aEmptyStr;
+ return aEmptyStr;
}
String SvtLanguageTable::GetLanguageString( const LanguageType eType )
{
- static const SvtLanguageTable aLangTable;
+ static const SvtLanguageTable aLangTable;
return aLangTable.GetString( eType );
}
@@ -173,13 +171,13 @@ LanguageType SvtLanguageTable::GetType( const String&
rStr ) const
sal_uInt32 nCount = Count();
for ( sal_uInt32 i = 0; i < nCount; ++i )
- {
+ {
if ( rStr == ResStringArray::GetString( i ) )
{
eType = LanguageType( GetValue( i ) );
break;
}
- }
+ }
return eType;
}
@@ -189,7 +187,7 @@ sal_uInt32 SvtLanguageTable::GetEntryCount() const
{
return Count();
}
-
+
//------------------------------------------------------------------------
LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const
@@ -201,4 +199,3 @@ LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32
nIndex ) const
}
//------------------------------------------------------------------------
-
