View | Details | Raw Unified | Return to issue 102212
Collapse All | Expand All

(-)main/sd/source/filter/ppt/pptanimations.hxx (-2 / +2 lines)
Lines 373-379 Link Here
373
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29	,"ooo-entrance-ease-in" },
373
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29	,"ooo-entrance-ease-in" },
374
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30	,"ooo-entrance-float" },
374
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30	,"ooo-entrance-float" },
375
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31	,"ooo-entrance-turn-and-grow" },
375
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31	,"ooo-entrance-turn-and-grow" },
376
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34	,"ooo-entrance-breaks" },
376
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34	,"ooo-entrance-brakes" },
377
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35	,"ooo-entrance-pinwheel" },
377
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35	,"ooo-entrance-pinwheel" },
378
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37	,"ooo-entrance-rise-up" },
378
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37	,"ooo-entrance-rise-up" },
379
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38	,"ooo-entrance-falling-in" },
379
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38	,"ooo-entrance-falling-in" },
Lines 456-462 Link Here
456
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 29		,"ooo-exit-ease-out" },
456
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 29		,"ooo-exit-ease-out" },
457
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 30		,"ooo-exit-float" },
457
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 30		,"ooo-exit-float" },
458
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 31		,"ooo-exit-turn-and-grow" },
458
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 31		,"ooo-exit-turn-and-grow" },
459
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 34		,"ooo-exit-breaks" },
459
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 34		,"ooo-exit-brakes" },
460
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 35		,"ooo-exit-pinwheel" },
460
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 35		,"ooo-exit-pinwheel" },
461
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 37		,"ooo-exit-sink-down" },
461
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 37		,"ooo-exit-sink-down" },
462
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 38		,"ooo-exit-swish" },
462
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 38		,"ooo-exit-swish" },
(-)main/sd/source/core/EffectMigration.cxx (-1 / +1 lines)
Lines 358-364 Link Here
358
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-glide", 0 },
358
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-glide", 0 },
359
	{ AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-magnify", 0 },
359
	{ AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-magnify", 0 },
360
	{ AnimationEffect_HORIZONTAL_ROTATE, "ooo-entrance-pinwheel", 0 },
360
	{ AnimationEffect_HORIZONTAL_ROTATE, "ooo-entrance-pinwheel", 0 },
361
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-breaks", 0 },
361
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-brakes", 0 },
362
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-sling", 0 },
362
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-sling", 0 },
363
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-spiral-in", 0 },
363
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-spiral-in", 0 },
364
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-thread", 0 },
364
	{ AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-thread", 0 },
(-)main/sd/xml/effects.xml (-2 / +2 lines)
Lines 942-948 Link Here
942
    </anim:par>
942
    </anim:par>
943
    <anim:par smil:begin="indefinite" smil:fill="hold">
943
    <anim:par smil:begin="indefinite" smil:fill="hold">
944
    <anim:par smil:begin="0" smil:fill="hold">
944
    <anim:par smil:begin="0" smil:fill="hold">
945
    <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-breaks">
945
    <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-brakes">
946
        <anim:set smil:begin="0" smil:dur="0.001" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/>
946
        <anim:set smil:begin="0" smil:dur="0.001" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/>
947
        <anim:animate smil:begin="0" smil:dur="0.6" smil:fill="hold" smil:attributeName="x" smil:from="(-width/2)" smil:to="(x)"/>
947
        <anim:animate smil:begin="0" smil:dur="0.6" smil:fill="hold" smil:attributeName="x" smil:from="(-width/2)" smil:to="(x)"/>
948
        <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"/>
948
        <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"/>
Lines 2082-2088 Link Here
2082
    </anim:par>
2082
    </anim:par>
2083
    <anim:par smil:begin="indefinite" smil:fill="hold">
2083
    <anim:par smil:begin="indefinite" smil:fill="hold">
2084
    <anim:par smil:begin="0" smil:fill="hold">
2084
    <anim:par smil:begin="0" smil:fill="hold">
2085
    <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="exit" pres:preset-id="ooo-exit-breaks">
2085
    <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="exit" pres:preset-id="ooo-exit-brakes">
2086
        <anim:animate smil:begin="0" smil:dur="1" smil:attributeName="x" smil:from="(x)" smil:to="(x+1)"/>
2086
        <anim:animate smil:begin="0" smil:dur="1" smil:attributeName="x" smil:from="(x)" smil:to="(x+1)"/>
2087
        <anim:animate smil:begin="0" smil:dur="0.2" smil:accelerate="0.5" smil:attributeName="skewX" smil:from="0" smil:to="-1"/>
2087
        <anim:animate smil:begin="0" smil:dur="0.2" smil:accelerate="0.5" smil:attributeName="skewX" smil:from="0" smil:to="-1"/>
2088
        <anim:set smil:begin="0.2" smil:dur="0.8" smil:attributeName="skewX" smil:to="-1"/>
2088
        <anim:set smil:begin="0.2" smil:dur="0.8" smil:attributeName="skewX" smil:to="-1"/>
(-)main/chart2/source/view/main/VDataSeries.cxx (-1 / +1 lines)
Lines 309-315 Link Here
309
        }
309
        }
310
310
311
        //do sort
311
        //do sort
312
        std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
312
        std::stable_sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
313
313
314
        //fill the sorted points back to the mambers
314
        //fill the sorted points back to the mambers
315
        m_aValues_X.Doubles.realloc( m_nPointCount );
315
        m_aValues_X.Doubles.realloc( m_nPointCount );
(-)main/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu (-6 / +6 lines)
Lines 211-219 Link Here
211
					
211
					
212
				</prop>
212
				</prop>
213
			</node>
213
			</node>
214
			<node oor:name="ooo-entrance-breaks" oor:op="replace">
214
			<node oor:name="ooo-entrance-brakes" oor:op="replace">
215
				<prop oor:name="Label" oor:type="xs:string">
215
				<prop oor:name="Label" oor:type="xs:string">
216
					<value xml:lang="en-US">Put on the Breaks</value>
216
					<value xml:lang="en-US">Put on the Brakes</value>
217
					
217
					
218
				</prop>
218
				</prop>
219
			</node>
219
			</node>
Lines 785-793 Link Here
785
					
785
					
786
				</prop>
786
				</prop>
787
			</node>
787
			</node>
788
			<node oor:name="ooo-exit-breaks" oor:op="replace">
788
			<node oor:name="ooo-exit-brakes" oor:op="replace">
789
				<prop oor:name="Label" oor:type="xs:string">
789
				<prop oor:name="Label" oor:type="xs:string">
790
					<value xml:lang="en-US">Put on the Breaks</value>
790
					<value xml:lang="en-US">Put on the Brakes</value>
791
					
791
					
792
				</prop>
792
				</prop>
793
			</node>
793
			</node>
Lines 2022-2028 Link Here
2022
					
2022
					
2023
				</prop>
2023
				</prop>
2024
				<prop oor:name="Effects" oor:type="oor:string-list">
2024
				<prop oor:name="Effects" oor:type="oor:string-list">
2025
					<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>
2025
					<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>
2026
				</prop>
2026
				</prop>
2027
			</node>
2027
			</node>
2028
		</node>
2028
		</node>
Lines 2098-2104 Link Here
2098
					
2098
					
2099
				</prop>
2099
				</prop>
2100
				<prop oor:name="Effects" oor:type="oor:string-list">
2100
				<prop oor:name="Effects" oor:type="oor:string-list">
2101
					<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>
2101
					<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>
2102
				</prop>
2102
				</prop>
2103
			</node>
2103
			</node>
2104
		</node>
2104
		</node>
(-)main/filter/source/xslt/export/uof/odf2uof_presentation.xsl (-6 / +6 lines)
Lines 1189-1195 Link Here
1189
			<xsl:copy-of select="parent::node()"/>
1189
			<xsl:copy-of select="parent::node()"/>
1190
		</演:其他>
1190
		</演:其他>
1191
	</xsl:template>
1191
	</xsl:template>
1192
	<xsl:template match="@presentation:preset-id[. = 'ooo-entrance-breaks']">
1192
	<xsl:template match="@presentation:preset-id[. = 'ooo-entrance-brakes']">
1193
		<演:其他 uof:locID="p0099">
1193
		<演:其他 uof:locID="p0099">
1194
			<xsl:copy-of select="parent::node()"/>
1194
			<xsl:copy-of select="parent::node()"/>
1195
		</演:其他>
1195
		</演:其他>
Lines 1684-1690 Link Here
1684
			<xsl:copy-of select="parent::node()"/>
1684
			<xsl:copy-of select="parent::node()"/>
1685
		</演:其他>
1685
		</演:其他>
1686
	</xsl:template>
1686
	</xsl:template>
1687
	<xsl:template match="@presentation:preset-id[. = 'ooo-exit-breaks']">
1687
	<xsl:template match="@presentation:preset-id[. = 'ooo-exit-brakes']">
1688
		<演:其他 uof:locID="p0119">
1688
		<演:其他 uof:locID="p0119">
1689
			<xsl:copy-of select="parent::node()"/>
1689
			<xsl:copy-of select="parent::node()"/>
1690
		</演:其他>
1690
		</演:其他>
Lines 2764-2770 Link Here
2764
				<xsl:value-of select=".//@fo:widows"/>
2764
				<xsl:value-of select=".//@fo:widows"/>
2765
			</xsl:element>
2765
			</xsl:element>
2766
		</xsl:if>
2766
		</xsl:if>
2767
		<xsl:if test=".//@style:break-inside">
2767
		<xsl:if test=".//@style:brake-inside">
2768
			<xsl:element name="字:段中不分页">
2768
			<xsl:element name="字:段中不分页">
2769
				<xsl:attribute name="uof:locID">t0062</xsl:attribute>
2769
				<xsl:attribute name="uof:locID">t0062</xsl:attribute>
2770
				<xsl:attribute name="uof:attrList">值</xsl:attribute>
2770
				<xsl:attribute name="uof:attrList">值</xsl:attribute>
Lines 2778-2784 Link Here
2778
				<xsl:attribute name="字:值">true</xsl:attribute>
2778
				<xsl:attribute name="字:值">true</xsl:attribute>
2779
			</xsl:element>
2779
			</xsl:element>
2780
		</xsl:if>
2780
		</xsl:if>
2781
		<xsl:if test=".//@fo:break-before">
2781
		<xsl:if test=".//@fo:brake-before">
2782
			<xsl:element name="字:段前分页">
2782
			<xsl:element name="字:段前分页">
2783
				<xsl:attribute name="uof:locID">t0064</xsl:attribute>
2783
				<xsl:attribute name="uof:locID">t0064</xsl:attribute>
2784
				<xsl:attribute name="uof:attrList">值</xsl:attribute>
2784
				<xsl:attribute name="uof:attrList">值</xsl:attribute>
Lines 2842-2850 Link Here
2842
			<xsl:attribute name="uof:attrList">值</xsl:attribute>
2842
			<xsl:attribute name="uof:attrList">值</xsl:attribute>
2843
			<xsl:attribute name="字:值">false</xsl:attribute>
2843
			<xsl:attribute name="字:值">false</xsl:attribute>
2844
		</xsl:element>
2844
		</xsl:element>
2845
		<xsl:if test=".//@style:line-break  ">
2845
		<xsl:if test=".//@style:line-brake  ">
2846
			<xsl:element name="字:中文习惯首尾字符">
2846
			<xsl:element name="字:中文习惯首尾字符">
2847
				<xsl:attribute name="字:值"><xsl:choose><xsl:when test=".//@style:line-break='strict'">true</xsl:when><xsl:when test=".//@style:line-break='normal'">false</xsl:when></xsl:choose></xsl:attribute>
2847
				<xsl:attribute name="字:值"><xsl:choose><xsl:when test=".//@style:line-brake='strict'">true</xsl:when><xsl:when test=".//@style:line-brake='normal'">false</xsl:when></xsl:choose></xsl:attribute>
2848
				<xsl:attribute name="uof:locID">t0076</xsl:attribute>
2848
				<xsl:attribute name="uof:locID">t0076</xsl:attribute>
2849
				<xsl:attribute name="uof:attrList">值</xsl:attribute>
2849
				<xsl:attribute name="uof:attrList">值</xsl:attribute>
2850
			</xsl:element>
2850
			</xsl:element>
(-)main/oox/source/ppt/commontimenodecontext.cxx (-2 / +2 lines)
Lines 129-135 Link Here
129
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29	,"ooo-entrance-ease-in" },
129
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29	,"ooo-entrance-ease-in" },
130
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30	,"ooo-entrance-float" },
130
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30	,"ooo-entrance-float" },
131
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31	,"ooo-entrance-turn-and-grow" },
131
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31	,"ooo-entrance-turn-and-grow" },
132
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34	,"ooo-entrance-breaks" },
132
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34	,"ooo-entrance-brakes" },
133
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35	,"ooo-entrance-pinwheel" },
133
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35	,"ooo-entrance-pinwheel" },
134
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37	,"ooo-entrance-rise-up" },
134
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37	,"ooo-entrance-rise-up" },
135
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38	,"ooo-entrance-falling-in" },
135
	{ ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38	,"ooo-entrance-falling-in" },
Lines 212-218 Link Here
212
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 29		,"ooo-exit-ease-out" },
212
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 29		,"ooo-exit-ease-out" },
213
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 30		,"ooo-exit-float" },
213
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 30		,"ooo-exit-float" },
214
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 31		,"ooo-exit-turn-and-grow" },
214
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 31		,"ooo-exit-turn-and-grow" },
215
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 34		,"ooo-exit-breaks" },
215
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 34		,"ooo-exit-brakes" },
216
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 35		,"ooo-exit-pinwheel" },
216
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 35		,"ooo-exit-pinwheel" },
217
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 37		,"ooo-exit-sink-down" },
217
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 37		,"ooo-exit-sink-down" },
218
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 38		,"ooo-exit-swish" },
218
	{ ::com::sun::star::presentation::EffectPresetClass::EXIT, 38		,"ooo-exit-swish" },

Return to issue 102212