[Libreoffice-commits] .: sd/prj sd/xml

[Norbert Thiebaud]

 sd/prj/build.lst           |    7 ++++---
 sd/xml/makefile.mk         |   13 +++++++++++++
 sd/xml/transitions-ogl.xml |   15 +++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

New commits:
commit 613c805a0e68c01e0cf1199617ce5fbca57f5389
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Dec 4 06:12:47 2010 -0600

    merge transogl-transitions-sd.diff and transogl-more-transitions.diff

diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 441bedd..f591af9 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -34,7 +34,7 @@ sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
 sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
 sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
 sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
-sd	sd\source\filter\xml					nmake	-	all	sd_xml sd_inc NULL
+sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
 sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
 sd	sd\source\ui\animations					nmake	-	all sd_animations sd_inc NULL
 sd	sd\source\ui\slideshow					nmake	-	all sd_slideshow sd_sdi sd_inc NULL
@@ -44,5 +44,6 @@ sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc N
 sd	sd\source\ui\framework\factories       	nmake	-	all sd_framework_factories sd_inc NULL
 sd	sd\source\ui\framework\tools           	nmake	-	all sd_framework_tools sd_inc NULL
 sd	sd\source\ui\annotations				nmake	-	all sd_uiannotations sd_inc NULL
-sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
-sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
+sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
+sd	sd\xml									nmake   -   all sd_xml NULL
+sd  sd\qa\unoapi 							nmake 	- 	all sd_qa_unoapi NULL
diff --git a/sd/xml/makefile.mk b/sd/xml/makefile.mk
new file mode 100644
index 0000000..7fe266b
--- /dev/null
+++ b/sd/xml/makefile.mk
@@ -0,0 +1,13 @@
+PRJ=..
+PRJNAME=sd
+
+.INCLUDE :  settings.mk
+
+.IF "$(ENABLE_OPENGL)" != "TRUE"
+ at all:
+    @echo "Building without OpenGL Transitions..."
+    @test -f transitions-ogl.xml && mv transitions-ogl.xml transitions-ogl || true
+.ELSE
+ at all:
+    @test ! -f transitions-ogl.xml && mv transitions-ogl transitions-ogl.xml || true
+.ENDIF
diff --git a/sd/xml/transitions-ogl.xml b/sd/xml/transitions-ogl.xml
index 8db9434..ca1e366 100644
--- a/sd/xml/transitions-ogl.xml
+++ b/sd/xml/transitions-ogl.xml
@@ -30,4 +30,19 @@
  <anim:par pres:preset-id="rochade">
   <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="bottomRight"/>
  </anim:par>
+ <anim:par pres:preset-id="venetian3dv">
+  <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="bottomLeft"/>
+ </anim:par>
+ <anim:par pres:preset-id="venetian3dh">
+  <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="topCenter"/>
+ </anim:par>
+ <anim:par pres:preset-id="static">
+  <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="rightCenter"/>
+ </anim:par>
+ <anim:par pres:preset-id="finedissolve">
+  <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="bottomCenter"/>
+ </anim:par>
+ <anim:par pres:preset-id="zoom-rotate-in">
+  <anim:transitionFilter smil:type="zoom" smil:subtype="rotateIn"/>
+ </anim:par>
  </anim:seq>