From 16ddfa21d6e92af6d2ce30a3d80f7184d3a462af Mon Sep 17 00:00:00 2001 From: Mayank Gupta Date: Wed, 30 Mar 2016 11:47:01 +0530 Subject: [PATCH] Slideshow: Add 'Oval' Shape Transition variant Committer's note: There is no Oval or Ellipse transition in MSO formats, so fallback to circle on export to those. Change-Id: Ibc3d617d3bb94bdd0702bb4d60ce5fbe2eea8e24 Reviewed-on: https://gerrit.libreoffice.org/23661 Tested-by: Jenkins Reviewed-by: jan iversen Tested-by: jan iversen --- .../data/org/openoffice/Office/UI/Effects.xcu | 33 +++++++++++++++++- sd/qa/unit/data/AllTransitions.odp | Bin 13757 -> 15719 bytes sd/qa/unit/export-tests.cxx | 4 +++ sd/source/filter/eppt/pptx-epptbase.cxx | 8 ++++- sd/xml/effects.xml | 16 +++++++++ sd/xml/transitions.xml | 6 ++++ .../source/engine/transitions/ellipsewipe.cxx | 25 +++++++++---- .../source/engine/transitions/ellipsewipe.hxx | 4 ++- .../transitions/transitionfactorytab.cxx | 2 +- 9 files changed, 87 insertions(+), 11 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu index 765a0d51d3c9..23824c1fd56a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu @@ -50,6 +50,11 @@ Circle + + + Oval Vertical + + Fly in Slow @@ -1728,6 +1733,16 @@ Circle + + + Oval Horizontal + + + + + Oval Vertical + + Diamond @@ -2051,6 +2066,22 @@ circle + + + shape + + + oval-horizontal + + + + + shape + + + oval-vertical + + shape @@ -2383,7 +2414,7 @@ Basic - ooo-entrance-appear;ooo-entrance-fly-in;ooo-entrance-venetian-blinds;ooo-entrance-box;ooo-entrance-checkerboard;ooo-entrance-circle;ooo-entrance-fly-in-slow;ooo-entrance-diamond;ooo-entrance-dissolve-in;ooo-entrance-flash-once;ooo-entrance-peek-in;ooo-entrance-plus;ooo-entrance-random-bars;ooo-entrance-split;ooo-entrance-diagonal-squares;ooo-entrance-wedge;ooo-entrance-wheel;ooo-entrance-wipe;ooo-entrance-random + ooo-entrance-appear;ooo-entrance-fly-in;ooo-entrance-venetian-blinds;ooo-entrance-box;ooo-entrance-checkerboard;ooo-entrance-circle;ooo-entrance-oval;ooo-entrance-fly-in-slow;ooo-entrance-diamond;ooo-entrance-dissolve-in;ooo-entrance-flash-once;ooo-entrance-peek-in;ooo-entrance-plus;ooo-entrance-random-bars;ooo-entrance-split;ooo-entrance-diagonal-squares;ooo-entrance-wedge;ooo-entrance-wheel;ooo-entrance-wipe;ooo-entrance-random diff --git a/sd/qa/unit/data/AllTransitions.odp b/sd/qa/unit/data/AllTransitions.odp index dfb8d2ace8e6cea67b370d700a27e9189cb848ca..8922a0756d4b0bb31042ca00e24e8038523b24ab 100644 GIT binary patch literal 15719 zcmcJ$Wk6-gvL*_JySuwP6z=Zs?(R000~SK*c>qjES_Ogbn}z;PdkJ z160Y(+1kKH-`vWP&gsu2t(}c&sGN)_3?wGxM-~`yF(Cy20KktVKsPwh$90uSS_uH) z%e|bGk}xDB6cj8PHWC~XDlRNC85|xv5(Xg#CNU-sJq`gC3NZ%`DF+EE4iPQ^J}xCK z0WK#ACJ{anUo|B- zjikBE6}SZjg#<+;_{9~3Wz?kQl_liWv}E|T|E^34V>(4oSht;UEQ4Aecat#+}zz&ZT!`&0yOQu>$yaje2cO3jI<3% zaq7H{obsZ+<;Qvi28RWO1cygP1%}7?Mx;bU$Hhj4CdEah z#`wp?#V4gCrzXeyB@_pzR)@srgk)3)XVyn%HAI)SrRG&87u3d=bfgv5=EV7xB>0tQ zMAm1AwwEU6SGU&I)V4I%H@9^pm-nRB^=H+M#tHwUzaCw2XDu5B9W<^mokkl+TZ}EsZoS zjkb;tcK`f2(LK2~GC4OewK6fgG(A2rH#ssrHMuf9xHvn$vNAM3H~(v4abam?apBkM z;@r~8>csNi_}bC@+V<4y;o#QQ?Domp=I+|w@%--P#@YSO{J`Gg$l>bP&g$IO+S2a! z`q}o}@$Tx$@%qK??A5`_)5Y@U?*8`gqrIck!@aH3qrKD9)9vHi!?UZs%ZHQ8o73B; z%hQ9ai@n>cvxm$5r<>!e>+9>=hnuIDr~8|i$J@8Jw~zk+{{FtIl=v|qfO5r!_?6t2 zPZunuBJHueFNawoVj}|M+ah8Z1kd_Ym$XoIeyBNy?t0tO3Ys`l3GQ+9#z-F2o5YRu zjTSm^j#fHR!lusVZ&1C9PSjrZLeb%NzMnp3a(BJkn(n_p>i)cL9`RXU{TzD#55?O8 zrT9JPVW3ZUKb}{mZN$wA(RYO(5HP*4d*{9n1{OSJry@%osYpP`A5xsihq#(2&RVt{ zg(i#vf-m0j%Dg-EOSI~xg$~Z8sqhR`bqV?5<$1(g(?nk8z}U+1$hmM88!ryWX&eib zGLK6MWWK@f@)jXQTWrR(qs?JMbeyTDq{#~m$d4gv0Q)^k)MnYG#e)&Y>JodR{v#|F zd?CUh;l~1uS?<0?0_~qdfn%E0FG=Z1PIFz=zH}1~yOG6?H@lVV?2SczaITr!%QT!L zwe$PC!ee*1oD)EH-*Q~vJ3RPlw4X9wDvY(R;4PcmEACr$^hdl6Pj+0_qK_l2SSNY{flU;*{UU~lL-BJ*_uOejk zx&Kkf%^JEDu5WU@(`~${(if>klCL1}q<5gkkvt*!VkiY3WjkC0bxJD18aKo6HEpVZ zV&^cK{p;;oSL-Vrs(?4_gcSDLw8Kw7f2#xT&>(>|b?QRETc)Bevn?;{dqm^ZHlEji z4HfADtnTKooG&%2#vm=#p(=99)C93xI&B`_ep6iGq6Z-4D0(z5_K>|1*ZO696!x?~ zQ3n#%K-~Z{mw2A=LT%q(hdVK<>>m8PjQXL>_;Ap)sMU3KR?;CnoRX87Xm^7KO|?pX zZ*+FAuIP=P32MH~j!pWRxa6nr`?LH*^*GM?m;Z--_WuU@qPoeJxVuqUzlindGrzd7 zj8K(;p8tO>iQwSif2^~ANBU!(HFnacb+fjLRFaNPr$=tTR~53V*2BW~r|H!xD+{jF zC{-_Q8m`$e=>WmP5S#JQ1tK6>D+$}|y&g|@$0POOQr_DJsG9y&0fe}v2PmRZIN^=M zWy=$+exc?$d^#4M)SZ~94N?R{Wj4^ODBU-d?>xocS83+d7g>_CRk_;;$|V1QJpq=> z;6T~%*Z`}u()b%3Cwk~0Md;Tlf__BqmXklFd(V6(6<9(XxWoYprVyb&snz*~jv}{< zO{vS&gW@!-bPL^32GgW*Wk<@HxgikfF~cBot>I%nairr>23(rz2A1_CZKHlBYu%Y#qDiNdKnj7c~e*g(DUD_fW+dYBWv8&n5A zG6U&YObk33mOs0G#zSZ|xy&|m5qoRTaN;f!3k(B{cxxy_@!M@2mH(`fxP27qVhN-~ z)7zK8GDpFx?dKrRTwU|K9qKDsyNUQNV+iTk7@y7k2k`X(z{$ocw;4{bji6=T9zdFW zw%#`c<5$XyAu{XM**nuD8^zWX{-%aHTYSv~Kc&zFC1NQPs$TFx1Mpm z*vk0BPPPtohRzNSpC0MQcmn#cFWBb*1Nd`Z`1h9kr@A=V+FIG^+ZbE@hq_?@LvidJ zY)wD>;r|co{Zk8nKJhP`|5Nop{bNTbcPnGZ&l;X;OGfW}MeIDUrpG2`9r1X~{doht z1l&VQp9#Yl-vL@Lv@$xJ$2W3%mvM)8q7V1{ewR#*mnX%oS!+CYY6hB8Gfb%dqDGAx zPI9#7N~h^_18u*XyJ=rhzU&4J1lFSS!yEhk?vTuw;qB~IcRhE0)NwN)JYx+Nv<7hi z3{Qkefh`2r?e~sbZ~z!EA)NwC+&9$!pdWZlV<1LV7Sn-e1G*r`mhePzverYJh zWhwO^R_lyJNs?{oC+Vm~^}vcP50ET0FNlw$kQA`XLHKtLTI~-y7mxPsp*t7)j7#VD zN9#%mI%zM!@qtqa6r-<8wQ@-fP zA}sy%gv14HO0?<9#K|MW3)ihRPTbX0dM;l9Sd*AUGEh)vt!XKXsFK(G-4q!*!$*)t zjNZAt*hW#-zgmaSnB+M8K>K<|TAVaS6sVwL4#=~F(H2ysj`T(?e{MN)zZg!CG@Pm7 z0QMjg#y8bjz8Soo&hQ(z~L7_K_o!}@yN@s5=;JJD*bv{Q2{v-pRe*Q@VL4^2t zefdl4*Ieeq8?e} zx`1Gmv`#Mvubfqtv%3gBMN&Lbylz6bbw8td{C%b9^AtcRQrUusE?Mz~rkmI~ve(kc$bhTZ_HDJ|lU8|TWwrrV_WZchtwDS#l6d7pz7mRI$=LybR z?m@H3$70J#-RZF%H7s)?L9A3vSu%+maWeDHyxIQ9TrYNky(2G@mHy#&jfA%{nh;ckI()7h0&8>dR6p z%!yg42UIw?jxB}P>&A>vCoC)pQ}I2o6wf6Gb$Z+faT}x+kq19`8*?PsMgibm1>i?L z`$D$P;5?{7+~BqnLtDs|eFC3T+Yj$qbQ{kvg_ZLgZK2h4{r5Lj|V}6EQgd z;I!clU6k6Y3z-Y>oWvPJvOI5bTFGZ$xh%hqqyqmg9aW!WF_kyq38oM)9%2^c8{!~s zpQfpj^7F19Z2mfXPi`92sEh(Du!Al{!@)4c{Y$ck9x|gTIaMn|;kX!v zB=V3`fMU{qpYk|I%w+ev2hrXI;37b>buZUKArha2QV4C7UPZgn^sou81e5Rv8s@8H zfiJs`C*5e-Y6kR(5zkWgV}_dgnJ3;LQI_~@s29iYXfDaz=hLCf_qXSBrOg5f;#5Q9 zMxC4oJ#mMbnygq@sj|6fIc$MO-Z+F8w?*1mUYoqMT92VL?+FuiZCTAty$nAfO_l@_ zEdpo|@cZDHB@6+M8YbdyN@>+n$#)giO(f{Lmgheh>z;gPSh9F zvLHGrq|_uks4T&uPchn}1nke#uP zIOb(Ml^2EPC$gc{)Xwz_ZcD#!b-wcSP-R+?E<9RK?@AoT*^z3TFNJfF&Y)d}XHGfR z%E+H@8@IltS=q^wrBg(zzk?aRx(YsL*2=!a!M`T|5`HJs!a+LpMDnuhAiwG1k1fZT z<`4nIoSq?4NO((v(zY|P2eD^_RVr?Wp-mp40Ii9c`Khcp6sMuoIPaBh#v8j8I-;Ou4^W%#ccnL;j$xJ3Ri?eU^c7`M?)19-I&p zqIHm&n1lDr)ib8)sMSawcuw8ui57~jq+srDcb;dKo!kN~E?2``ygMkHXElyvt)NMZCDCwkt>F+>MSY7@e3H zjB&=~Tw^P3srAZ&hkq?)irBcIt#EYBHus+yXr8w97q<VR(Q2KOBvc7-yHqg0-|qrCQhQlf2?bEhTKoaXp*_j)eKeL6W~}o(J3aA z`7Mx8cLG2&!NmcDR-92oqL;d+XQKt{xMPr_>70^mVqz=BhT>R`H9j$>U$qhrrLSYB zwZQQdE_1HPknIxC;>+U#yYD2FJ zoxJ}i`1yEyWzTp1XQL^#rg7IC!E9`K9b$7YXUevE4OjF9ducr1x z^G1j|umin=SLB6)=sQQhy^h6yrOhpEBdq3e_%RTwLB6JIa&R=4Gz&sLsMXMtL+tA& z)JAv$p@chhgS3tA=5V5y3a#`dX9ECzSm|h2*&u+ZOc7g#V z#8tots$+f>`LDT9ctzADOo1>g>AIaXuB)Jpb648?G$kjkUrN5WyW}HevKuWIKq|1D zx|cKP?!3|BdQ~nYlBsLuYhkDVAV;79nh#&#UJuJqOIkw=chtRT*QQ<`8)%`^(ZLGu zG@YRv2qpH^-dW&Mzw+uqdGos(-%$MFVN2 z=aFuYr?<1MaUF1Vp<~XmMbF>nY$OxsYn!CgstXuE)A)w$pZ@(&kzY~qmxtnvbFPFe zUX=^TJ{FrT=9h#ZfI?lU+#DraE3AMTZuFHuE=|ExdRB0Q zcmI9a_$m-kL(>5xhY_7*WW|qMXB%*(Z?L-(O&<#T*PM0-UvdU<3&Bk zkRq#6pP9coCetral{%IRbEagzUk8#3k*OSeTW!WuS5uv1VN|v|qd7V{TE~8gUkEvq zHFRDUyPs`e9yH&s)16-`yHyC;P&`yb+X)hZyRS6~EEZL8r&BE^X)xq5q~{SCE>&&R z7vhFranp246#F`LW;t@x?!Y`cA1#S=&2;^J6ioKPkI5Kr$-iL~TO!h`nXVk{HGXW_ zTQgz`kxpn!&tfAOmK`-_1@|izFKYz_9jVr&v34EMWDmu9K(V86{+b+fnUQ#A0Kml})5UU8OhuWXyyd zmJ?}sKEAqbcvco=ReolJKGchK_NGmrDQX>F_HLE86e|W5==&Z3I1_f>Vlh6Z5_zbl z!vdbKsENv`h)lJ^wY5zdE@Hbf#%ULr5puiUGPg1P<6V7C zL(_5lE3)@_^{`tbQyW}=cN`YdA|PVgcr65s(aLH154aqWB(6B@;I}7S3_%F=?T48| zX1MeU8m|qq!-Lh$tFiE*s4RX;O1H5x9Mwvq%_uvH?1qXV`z{9?FY|XNiXz1$zF8ER zO~3^d5RDyp=fK$(3tHW#3cjl%{ID`oGTf3Pm$Y86&a_{v*lQ8PNwPZVd$Kf^RSg^U zr}WU#eUn21KTnni2EOBTXv5r+kOvZSAZA3_IsPQABzj2rIg>{%YWovSph7quV(hzc z@A14vpU#^Pi-vnb;U1$QRn&#&9G8CeU6|cb;dcf@SCtMWXSL@6jc=Z6SfmO~%T(Xg zQu&`5*E9C2A?G(Su-L=!up()oDAFg9dmC=m#IJQGA7v7ke4~IFQ9BzvO3`>a3$!#( zB~A-myv@(QbU=9mC}xJNKdcVJykR-tazS)>%X3%m1$6;(q?46ZvmQmx)<2*`KcI|i zy8*hUL-p?Vh5gRy7!k%CfM0LbWK2vlgHTyn6dufc5LUQX8F;P%;YIKV+*0`_k>bzw z;6?Fphl}RtT`rRGV5qNl*JFvXD})z^;Ys8m(n1;C|H7GrEm6>%{Q?nnCh4j6bwq9x zh0>Tp5VZuWR~xjfPoS23+9h&r8&5TET*Pfs4a3xNqC}K^njYB-;dB`Q?;t8y(m|pj z-h$=W!lmVomVBscV4ndWD#BysL8!+(Kb&y4*J7pA=cndUJ@hoM#g(o+6Z}u4W?RXc zji6Q}oXDR(3WI>_p;>wcss`SMKH%uXjQNq5bGi(WwnHN=F>bDmIvEJ`H)fld7ez|&|a*V$}sSI=I zM+wjo@O}!0U+0zuuch!8?d_Y`_SiUX){(`{;VV8Lr^W+jg!Dc)pLX)hrolxSrpgn) zl&_Oyp>?v7+Pc*LQS5cGMWoXB6kqvU$o~{6=xS?!at#g-2>FhJv@vn8HeBppEmZs~ zOA3*ge`&%A#AH2+w4zmn0;Kdp-fqJM3g=S476J>MR(QHRl$3Zk^C-sQZbg9#?^yHU z!aDG3CwW=k>W1_&6nkzJl&7`i<2Os7ajk&BT^=6%O?4Os`j>BVc%m4Jkwv&}(aSI}gSpx`N(F)=h2R=O$IcaJ62Om4St{he><7eqY#(?hKDbH|$^qoiqi@ zyL$G(l$Y&Ye|!t+IL8t>?fPSX+#w4ElNba5AfNa@&8{dPv#YeQ5>XORbA26zfg{BeOTY zp|>n$XI9F<$6qein!fc@@||)92#&48+1^5}oPUi}{8+(>tNE3m=+|bF_CjXLjpBs% z@Wp3lz`B1Pp8$w^4~&T)CQU$FE!ilp-Fg`2(!O3gh~6(PbC7d1N>RtIR^vE{%sW9$ zF{1dhXvq78BDr`nj_>ohhs2Ds>!+yg?AeW<0VURmPqFL*27}NImIC&x=@xGLBGdJ0 z>5;I-qmPw~>2lwh4BLA+FGCixsF9aO3+$s0^-x>BNgwxAOJImXabZ>MLm&4eX;T;Y zWb4`s@lGDNwnK!BlJZzIBW&C`-9vn?T0ATfd?+7rhwYC875_dS1@&Q9Lt7iC|K37B z&D2g#XG`-vzgK;j%UCLRZh3H0wvJGi&9|4+h7>sX1`?WVe5J(CLr(Wyv?eh2) zZuU65tNpo&)w9J2umi^ZN2s}i6i^oO_C_ch$B1pyw+$Vu+TEo1jJ+m^P;+lh;3lrZ zk++f+kE0dJ>QgfJOKfMJb_p%s)*M;kg@Cd8NW+o5Z$Fi{pQiOiaNBUTict6~@j7?4 z;k-xl597j1hA1c&d(^pvsUM&2478CCPp$4A9^4)ew63gJ>TGOmOy+gmd;O%6ZE8y- zP(Yb5ry1)!O|&)Yyp~f?3yvQX&5w%{thPZWID&(acT1FJBYqQxHm}wixIE`QF+@Jy z{y5TV!&M>c#jX(l)sm$gnyx$m(WZ(*R)L2VZ{U^ZS#8Q2nmMn_>*Zals=mrn&1g-e z#6LLmGr2`tn>WjmR4Z=ig%^2wdwb|8-!2*K57U)3Mtj_>mm{B-n@3u;*_3u-lYJyv^*A(Q_fRR^x)Mi< zka{vo8gaG#GPxq|R_EGU#*Bz&)-kiuIsw$F+Gjz&U4t?7%5XN0$R7^pJcpD}g2oE= z96zNtrMiutx({};X)$Gs@50<26PLlZS$hh0)Du=+CbsR{pJHLcQHbPox9pNobOl|TXM~4Q+o)x& z|BABVxvqUEU0FzErGQHg-f#n`z@N+%P{up+Nlkn%+9T5CnsZ^FPvf{7X!B|_8LROm z4)Qo$9uzyp_2cD8Zks{ULdB95E9%2G@_>bY_cXR?YUPw+mZZ$f52+FQ%c5u{=5 z9ipkJ)0j;fiBIw)a&nl%dwLbh&HM%@z5svbXC08ONZl05h zM5j7qdeIo?cudBYRjP(tF?`wGKB$=zO!h-H{?jN`J@O(@qEH?@<CQIv-Ue65y7xv4YVT7uE~_$fU-!o zdtQxaEg}6QcOV55h{n{agm8!$WP5c;LIlCUdJ5(HXS9|cVAN2BUVr;+9dxJI#MGt> z#3@fQ_OJV#Utp$khHAg_V?q$i*G4BDi99mtW)t>Ty>2l#hLGf5{hmHt;9RW6QzbZZ zKEgSf!{aCC!u3GT_CjzS39f}bbxF$hTAVK}Ka#C(HdOVASrO&N|3$sQGZ2FF+NtRL zB!u?-kWbaSUKJ9s_Ogy-`xJ=Q_LxuA_ofgMfa6tZ&g>-+;q^3~Xz0}_m7Uk$+3~X= zg~y-l?o3oQqM?P(O9GMe0gNBjTpNE<}$9ay!CK6si4cX;~_ zHT&K#;YwGr*N)fqk?o6MoVP@@TRb44UQf6TNp+eLtAcFs^vhSLiVveS#g3>#P9{cZ3SE!R;fcaClRF&Jq3wzW0?DTmn`l~l zW>cFY8*M!o9`f^NKsDZYD~$#MU@e(|FqKN7Ch~hP+*}F)TWd zUx#?!4#MoE#ebEva}VLZ@q7C0JFt9D9z;Xa<$I3An5;466}oI_cagv5_wRT*BRJdm ztzj%$xvVTQ!vbYw=DKoQV&fVD2Z?|qpS*O=?F}RyT~{%r*F{H?`e4>}b?4N@@fv4E zc$wO)qasv)iX3fQVSH=qdYvHoO;(tIcl4Vn);>vBq&gvQ{fp!ZoJT}Q@sd1J@DQCQq;yP1StakF}#kkN~bF7V}L|5ai17|s1-i>Et3(UL&(=<>U zIzQ~Pd%PvH8p+F>BV17zsvJiGq-ldc3^U8@krl*jT5g1S9dqV7>4MfaF7#`nu0q$4 z1zMh@VzjmMc>fjG9%fH$;!Z(`pSQxsb$;NEwi2tnLS`>GxDRALSk`!Fq@`uumNz-^ zWcf0B@W4N0cYE6+ACs=QVNd2|Ke62wdmAlP#FJx+W!AaGA)ahA*I4Tpz zbN_@y0}`paS&;OV4kvc1f^^4KwD7n{2}0|Gky2rDxLY}e6dioph; z?K;_=@aeBK)MM#(G4SxH_^R6L#8C%Y+n3{f31{cSpT`ZOE$xjKiKCtMR-#dmtU>5B z&eG)~GMpQvcOxtPJU+tLlHa^N(@%!7?o^3sd)i91y;pgJ-W0BFU!Ah%hJe zr{(jezl-G0^5qAZF$WGhI9%u%IRT7>REpymafC=+4?86e-{iy|evLUKWP~BOCi0O2 z6)b{U1Qca#jF}c@Oe4!LCeDYG7OCbJfg3UNjj)u+9|;Zt)5TMlc{enWK2vy0gawt5 zMN6QNEDM*Pjw8GAQtHIVmS6IhfRi`JP3%NWbTm_Xf>C-3kpNIy)>Qf(P%{&(XM8zK zrScVZfX^gLuPAz)d2+lZE_GpQJcBibUDV_Y{VYaWsw2Ef6;l|^_;q~-5zWNxm4^5j zmYIeQtC@RbJ#bDTCo@eofmzFLI<&q!YSIF@ zcOd>T%3mR4bEWQ+9V^gY0e^-ll;{gYQzLIFIZl@)1H9c|u z#FMXH34xF)(snYdFUr-hm+eTDwdm{vA~+50uUDc0Q`^0UUrqt0ZU&ZW zau8!JXH8Wih=ok>1R0XY1PmzOz-;8FDX5}|RXc^n$o zBiA7GkwZvDk*Icxi1FtXfo9(Fn_O@bxquR0UI{8cpVBF+`ldtde0@0eTsSn}4O(0v zS5`ZjI?vL|TA!biCe3Ksm|L|s-3*Y%v9?*L4FWLDyhAJuEt|R)YgBL5j`!;RBTZ^0TtT z5&LYIm>_^hKVyF8)os+qMhKz&kir&+H#s?NB*fap81iR6cm;{r-#mFHCNRp2z%Mg>DP$<}!D2vb`&}6rhqJG0?v<;?dZ|nj?5A=Ve8=&`#K`WC zBWzVH{iG2+ai9~U8U^a8lPNhphrU0Ygqvx2Zz4>_#9L=LO=bIS7A$AmcfVqMHk(Z6 zdiD~sVNXFLcby#6lGx~3fsiYxe}aYUAfT(M(Vzp8_@jpcY}aN!P~8>mTY)2NbjbwY zrhMfD+vak_xS9({Qa6(>r;||-Rb3b3R-q_1J)iCv>p_oVvn(V?9sSE-)I8Mt@8uh z6h*-s`KN>rfxq}$9QK1G%Y2%Pz$~W)oo*1Hp>26oyme&Z=sWoK0NGqhTP$KB61YNH zArhJv$ER6{3o#U6-(0X&S2)dgc5NTLGiVcp?t%T|EbjY3TxCD8D9nEw!@1VzEpm9^ zM#U{Zg&uLk&4>BS!}c3u;ZAe;b>}a0+4oE!eKsUlCuTHnxX9v@yrxx< zD6>qyZh7m>=FMNBEA=v3^)gaD_Hx!s^S@-4H$&oKCU+1%3dQwbg|bhd2@RhKrQm|4 zqG?<16vx7|=a^LI%Cq?5C)!}K?O#r6qsU@!ABv{vhHW>PUw&F%UxN_22kRuH2;v`Q zp*R4-s=QiMy1mUvN2(GgL!>fC`UKq)m{Z=>3pElKok6w1ps864uz)bvOHRoEkFHF` zfZL3?^EDA2E!oGf`yj?rvh4|~%V~#vyA~$7WD#I|(ZnMD-3knt-3YKB>>Le|8 z?ZlyZ+gIy~gkwm9a7D0OTu2UhaAhbC+~yo2rlj-`xmj?W+K$5x6ZMp9Xkn$sTtpZg zaHTRB9Jtk~PqPaZ0_LVyxDn#J-&eyRU_@+!L}oQsU5oYG$mhs^!^7D}%@ifG;DkR= zvgE{VZu|pN2Hy$x!Lqg3`oam=l;se-?NozLcpB_WiN*8~5SrH?P1T&g39f^9X#ULM z#TU|Uxr5Wn3E!^R_JPs1!?K10w}!*!1iR!v=i=_++))Ej`d#T`Rf#FP^Ww7G7_xlg z!F}Q()hR@%VMfVFN2bnuw8Nfv@is^TbG3}4-1se7)?|TCqDc|D3l zIwW{H1VGYd6_)YcNx`bNAkg@SI`qAWuIvh+g|TsWolrf+Kp`QWrh6zMJTTonVGJ1U z7k6odVL^mp06L#sI4+M8v5{K6si49}&^g$#qgwcc${eA2urCP~^Fv^&UhPFkJGn=O z015YPpnGW|C+2Ko7MwhlFDk(|nkRUb13?tm16gWDR?nDl({C9s3VDO|Th4_F(?;7WPA6Xs(~u zXMcRMaUBeL1{qpNa{38~NLHBrok)TW-cCu9ji)*Avk}2XnIebn#J&wJG`jvoKzv@> zM+jYq1ty$dkAgcpeUP>t615%bcf!Z55NF$zWm!&=p~6Q~zQ@FH&x$4A=A&1j*?!n0 zjM_l9_e8dbroUoMoAM9sI44R9eC&q^)&*M)u5oBw?O(rFx5`Te@{?{z-3dr%_nsZU zoF4b<`8^icx77`ie-MKE2xc$CENIi{fb`KZZ9Y0C-s;q4dQen!P*f=EThay^G?*AV z4H=bSc*u#bn3E$ue5s4$?@gPi4JSuWCr2r%Y$J$FPb2rA`N4ogwEC+V)_5O|9AM(X z9zc#m)t$rdO`V_ZhkN7GV+_+!`>79}^ddj?m9Vv#^Puqd&9?b27M5RbYDR6_PJ!D8qzWJbil#X~%; z_J}Ci;60V7*c|OZ{&1_JtAFp1Wlin-4ux-lL+or-P>k5&%5mcP(O~aC@8&P}rUq!T zF&egndU~?py^G*o7d}+o+Ih}3+IjDD@jQ{FhtK9bpyn_c2|a@PM_4?Xz|wAvr(aEA z?_nV^d5tD5?2ZA24$?C@R8?+IksFvt0mWALka)1cH!FSnC5V&mJMuDC> zHR3eT?IpT5uX~@*E%NUHEi^}{001WVUp}_T0ly#v{Cjfb$3FSr2jW z`!B8kiPHEFD1VU+{yoa)QTxB-KL~^$$4z z2RY%t!2WEWPvt)u2A}kVza;e^!2S(c;Xk$Bzgq0#A3*<3RrvQc{Uj^=CFCEmp8vyQ z|3Y2(_elTRpA7y1=`Sk7zZ&cBhbKNN@;6EOK>3T>@TWcgH1glWf}ck#{t^MKe?4gN zKQ;dz`1%YR{v|p1|0am|KOz1;F?>eI{*niRe~FjLNrHUvoB;sfKYqS`5PY!MKY#mQ D*f;V% literal 13757 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 z_){4KDoClose(); } diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 7bd4b658cc3d..85db3a1e2c99 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -798,7 +798,13 @@ sal_Int8 PPTWriterBase::GetTransition( sal_Int16 nTransitionType, sal_Int16 nTra break; case TransitionType::ELLIPSEWIPE : { - nPPTTransitionType = PPT_TRANSITION_TYPE_CIRCLE; + switch( nTransitionSubtype ) { + case TransitionSubType::VERTICAL: + case TransitionSubType::HORIZONTAL: + // no ellipse or oval in PPT or OOXML, fallback to circle + default: + nPPTTransitionType = PPT_TRANSITION_TYPE_CIRCLE; + } } break; case TransitionType::FOURBOXWIPE : diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml index bef5e0580b94..b7789383ed27 100644 --- a/sd/xml/effects.xml +++ b/sd/xml/effects.xml @@ -91,6 +91,22 @@ + + + + + + + + + + + + + + + + diff --git a/sd/xml/transitions.xml b/sd/xml/transitions.xml index 8b96d7959e0e..cefcab31cf36 100644 --- a/sd/xml/transitions.xml +++ b/sd/xml/transitions.xml @@ -107,6 +107,12 @@ + + + + + + diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx index 35aa9ec69a99..d6f968fc1ffc 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.cxx +++ b/slideshow/source/engine/transitions/ellipsewipe.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include #include #include #include "ellipsewipe.hxx" @@ -29,12 +29,23 @@ namespace internal { ::basegfx::B2DPolyPolygon EllipseWipe::operator () ( double t ) { - // currently only circle: - ::basegfx::B2DPolygon poly( - ::basegfx::tools::createPolygonFromCircle( - ::basegfx::B2DPoint( 0.5, 0.5 ), - ::basegfx::pruneScaleValue( t * M_SQRT2 / 2.0 ) ) ); - return ::basegfx::B2DPolyPolygon( poly ); + ::basegfx::B2DPoint rCenter(0.5,0.5); + double fRadius = ::basegfx::pruneScaleValue( t * M_SQRT2 / 2.0 ); + + if( mnSubType == com::sun::star::animations::TransitionSubType::VERTICAL ) + { + // oval: + ::basegfx::B2DPolygon poly ( + ::basegfx::tools::createPolygonFromEllipse( rCenter, fRadius*2, fRadius ) ); //Horizontal Ellipse is rotated by 90 degress + return ::basegfx::B2DPolyPolygon( poly ); + } + else + { + // circle: + ::basegfx::B2DPolygon poly( + ::basegfx::tools::createPolygonFromCircle( rCenter, fRadius ) ); + return ::basegfx::B2DPolyPolygon( poly ); + } } } diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx index d710cba27794..c8d991b509f8 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.hxx +++ b/slideshow/source/engine/transitions/ellipsewipe.hxx @@ -30,8 +30,10 @@ namespace internal { class EllipseWipe : public ParametricPolyPolygon { public: - explicit EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {} + explicit EllipseWipe( sal_Int32 nSubType ): mnSubType( nSubType ) {} virtual ::basegfx::B2DPolyPolygon operator () ( double x ) override; +private: + sal_Int32 mnSubType; }; } diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index 8f10a551d219..021c3592ab61 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -699,7 +699,7 @@ static const TransitionInfo lcl_transitionInfo[] = 1.0, // no scaling TransitionInfo::REVERSEMETHOD_SUBTRACT_AND_INVERT, true, // 'out' by parameter sweep inversion - false // scale isotrophically to target size + true // scale isotrophically to target size },