Rename the custom animation "Put on the Breaks" to "Put on the Brakes".
So here's a question - what do I do when I fix an OO.o issue that's in
the OO.o issue tracker, but not in the LO bugzilla? I suppose I can't
really comment there and say it's fixed, since they're not going to be
pulling the fix from LO, right?
Patches contributed under MPL 1.1 / GPLv3+ / LGPLv3+ licenses.
Cheers,
Mattias
From b4396f4690e66aeb66c8f8422ae2c120481885a9 Mon Sep 17 00:00:00 2001
From: Mattias Johnsson <m.t.johnsson@gmail.com>
Date: Sun, 14 Nov 2010 20:54:59 +1100
Subject: [PATCH] Fix typo in Impress (i105883 and i102212)
---
.../xslt/export/uof/odf2uof_presentation.xsl | 4 ++--
oox/source/ppt/commontimenodecontext.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/filter/source/xslt/export/uof/odf2uof_presentation.xsl
b/filter/source/xslt/export/uof/odf2uof_presentation.xsl
index 4cc71ae..66122cf 100644
--- a/filter/source/xslt/export/uof/odf2uof_presentation.xsl
+++ b/filter/source/xslt/export/uof/odf2uof_presentation.xsl
@@ -1169,7 +1169,7 @@
<xsl:copy-of select="parent::node()"/>
</演:其他>
</xsl:template>
- <xsl:template match="@presentation:preset-id[. = 'ooo-entrance-breaks']">
+ <xsl:template match="@presentation:preset-id[. = 'ooo-entrance-brakes']">
<演:其他 uof:locID="p0099">
<xsl:copy-of select="parent::node()"/>
</演:其他>
@@ -1664,7 +1664,7 @@
<xsl:copy-of select="parent::node()"/>
</演:其他>
</xsl:template>
- <xsl:template match="@presentation:preset-id[. = 'ooo-exit-breaks']">
+ <xsl:template match="@presentation:preset-id[. = 'ooo-exit-brakes']">
<演:其他 uof:locID="p0119">
<xsl:copy-of select="parent::node()"/>
</演:其他>
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index 3bfb4d8..5e39adc 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -136,7 +136,7 @@ static const preset_maping gPresetMaping[] =
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29 ,"ooo-entrance-ease-in" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30 ,"ooo-entrance-float" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31
,"ooo-entrance-turn-and-grow" },
- { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-breaks" },
+ { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-brakes" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35 ,"ooo-entrance-pinwheel" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37 ,"ooo-entrance-rise-up" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38 ,"ooo-entrance-falling-in"
},
@@ -219,7 +219,7 @@ static const preset_maping gPresetMaping[] =
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 29
,"ooo-exit-ease-out" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 30 ,"ooo-exit-float" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 31
,"ooo-exit-turn-and-grow" },
- { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-breaks"
},
+ { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-brakes"
},
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 35
,"ooo-exit-pinwheel" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 37
,"ooo-exit-sink-down" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 38 ,"ooo-exit-swish" },
--
1.7.1
From 98a96f49762ee453b0bb8ea852e35bca74ee0b5a Mon Sep 17 00:00:00 2001
From: Mattias Johnsson <m.t.johnsson@gmail.com>
Date: Sun, 14 Nov 2010 20:56:43 +1100
Subject: [PATCH] Fix typo in Impress (i105883 and i102212)
---
sd/source/core/EffectMigration.cxx | 2 +-
sd/source/filter/ppt/pptanimations.hxx | 4 ++--
sd/xml/effects.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 8300bbc..966b820 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -361,7 +361,7 @@ deprecated_AnimationEffect_conversion_table[] =
{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-glide", 0 },
{ AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-magnify", 0 },
{ AnimationEffect_HORIZONTAL_ROTATE, "ooo-entrance-pinwheel", 0 },
- { AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-breaks", 0 },
+ { AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-brakes", 0 },
{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-sling", 0 },
{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-spiral-in", 0 },
{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-thread", 0 },
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index df7f107..12b2f12 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -378,7 +378,7 @@ static const preset_maping gPresetMaping[] =
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29 ,"ooo-entrance-ease-in" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30 ,"ooo-entrance-float" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31
,"ooo-entrance-turn-and-grow" },
- { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-breaks" },
+ { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-brakes" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35 ,"ooo-entrance-pinwheel" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37 ,"ooo-entrance-rise-up" },
{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38 ,"ooo-entrance-falling-in"
},
@@ -461,7 +461,7 @@ static const preset_maping gPresetMaping[] =
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 29
,"ooo-exit-ease-out" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 30 ,"ooo-exit-float" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 31
,"ooo-exit-turn-and-grow" },
- { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-breaks"
},
+ { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-brakes"
},
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 35
,"ooo-exit-pinwheel" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 37
,"ooo-exit-sink-down" },
{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 38 ,"ooo-exit-swish" },
diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml
index c67e251..420ac2e 100644
--- a/sd/xml/effects.xml
+++ b/sd/xml/effects.xml
@@ -922,7 +922,7 @@
</anim:par>
<anim:par smil:begin="indefinite" smil:fill="hold">
<anim:par smil:begin="0" smil:fill="hold">
- <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click"
pres:preset-class="entrance" pres:preset-id="ooo-entrance-breaks">
+ <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click"
pres:preset-class="entrance" pres:preset-id="ooo-entrance-brakes">
<anim:set smil:begin="0" smil:dur="0.001" smil:fill="hold" smil:attributeName="visibility"
smil:to="visible"/>
<anim:animate smil:begin="0" smil:dur="0.6" smil:fill="hold" smil:attributeName="x"
smil:from="(-width/2)" smil:to="(x)"/>
<anim:animate smil:begin="0.6" smil:dur="0.2" smil:fill="hold" smil:decelerate="0.5"
smil:autoReverse="true" smil:attributeName="skewX" smil:from="0" smil:to="-1"/>
@@ -2062,7 +2062,7 @@
</anim:par>
<anim:par smil:begin="indefinite" smil:fill="hold">
<anim:par smil:begin="0" smil:fill="hold">
- <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="exit"
pres:preset-id="ooo-exit-breaks">
+ <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="exit"
pres:preset-id="ooo-exit-brakes">
<anim:animate smil:begin="0" smil:dur="1" smil:attributeName="x" smil:from="(x)"
smil:to="(x+1)"/>
<anim:animate smil:begin="0" smil:dur="0.2" smil:accelerate="0.5"
smil:attributeName="skewX" smil:from="0" smil:to="-1"/>
<anim:set smil:begin="0.2" smil:dur="0.8" smil:attributeName="skewX" smil:to="-1"/>
--
1.7.1
From 912488e581b64b92d29f7d9f8cb8216fbe396d41 Mon Sep 17 00:00:00 2001
From: Mattias Johnsson <m.t.johnsson@gmail.com>
Date: Sun, 14 Nov 2010 20:57:09 +1100
Subject: [PATCH] Fix typo in Impress (i105883 and i102212)
---
.../data/org/openoffice/Office/UI/Effects.xcu | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index 68aca61..0c33d49 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -215,9 +215,9 @@
</prop>
</node>
- <node oor:name="ooo-entrance-breaks" oor:op="replace">
+ <node oor:name="ooo-entrance-brakes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Put on the Breaks</value>
+ <value xml:lang="en-US">Put on the Brakes</value>
</prop>
</node>
@@ -789,9 +789,9 @@
</prop>
</node>
- <node oor:name="ooo-exit-breaks" oor:op="replace">
+ <node oor:name="ooo-exit-brakes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Put on the Breaks</value>
+ <value xml:lang="en-US">Put on the Brakes</value>
</prop>
</node>
@@ -2026,7 +2026,7 @@
</prop>
<prop oor:name="Effects" oor:type="oor:string-list">
- <value
oor:separator=";">ooo-entrance-spiral-in;ooo-entrance-swivel;ooo-entrance-boomerang;ooo-entrance-bounce;ooo-entrance-movie-credits;ooo-entrance-float;ooo-entrance-breaks;ooo-entrance-pinwheel;ooo-entrance-falling-in;ooo-entrance-thread;ooo-entrance-whip;ooo-entrance-sling;ooo-entrance-magnify;ooo-entrance-curve-up;ooo-entrance-glide;ooo-entrance-flip;ooo-entrance-fold</value>
+ <value
oor:separator=";">ooo-entrance-spiral-in;ooo-entrance-swivel;ooo-entrance-boomerang;ooo-entrance-bounce;ooo-entrance-movie-credits;ooo-entrance-float;ooo-entrance-brakes;ooo-entrance-pinwheel;ooo-entrance-falling-in;ooo-entrance-thread;ooo-entrance-whip;ooo-entrance-sling;ooo-entrance-magnify;ooo-entrance-curve-up;ooo-entrance-glide;ooo-entrance-flip;ooo-entrance-fold</value>
</prop>
</node>
</node>
@@ -2102,7 +2102,7 @@
</prop>
<prop oor:name="Effects" oor:type="oor:string-list">
- <value
oor:separator=";">ooo-exit-swivel;ooo-exit-boomerang;ooo-exit-bounce;ooo-exit-movie-credits;ooo-exit-float;ooo-exit-breaks;ooo-exit-pinwheel;ooo-exit-swish;ooo-exit-thread;ooo-exit-whip;ooo-exit-sling;ooo-exit-magnify;ooo-exit-curve-down;ooo-exit-glide;ooo-exit-flip;ooo-exit-fold</value>
+ <value
oor:separator=";">ooo-exit-swivel;ooo-exit-boomerang;ooo-exit-bounce;ooo-exit-movie-credits;ooo-exit-float;ooo-exit-brakes;ooo-exit-pinwheel;ooo-exit-swish;ooo-exit-thread;ooo-exit-whip;ooo-exit-sling;ooo-exit-magnify;ooo-exit-curve-down;ooo-exit-glide;ooo-exit-flip;ooo-exit-fold</value>
</prop>
</node>
</node>
--
1.7.1
From af458151934306eec0f1e0c6f6fe9538d800188b Mon Sep 17 00:00:00 2001
From: Mattias Johnsson <m.t.johnsson@gmail.com>
Date: Sun, 14 Nov 2010 20:57:28 +1100
Subject: [PATCH] Fix typo in Impress (i105883 and i102212)
---
.../optional/includes/impress/i_pengine2.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc
b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
index f1fa908..9a295e6 100644
--- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
@@ -496,11 +496,11 @@ testcase tiPengine2ObjectsGetsEffects
active.setPage(TabEntrance)
kontext "TabEntrance"
if TabEntrance.exists(5) then
- printlog "Add Transformation-Effect: 'Put on the Breaks'"
+ printlog "Add Transformation-Effect: 'Put on the Brakes'"
TabEntrance.TypeKeys "<DOWN>", 30
Sleep (3)
TabEntrance.Ok
- Printlog "Added effect 'Put on the Breaks'"
+ Printlog "Added effect 'Put on the Brakes'"
else
warnlog "Impress:Tasks Pane:Custom Animation:Add... button didn't work."
end if
--
1.7.1
Context
- [Libreoffice] [LibreOffice] [PATCH] Fix typo in Impress (i105883 and i102212) · Mattias Johnsson
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.