summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2013-08-24 01:23:36 +0200
committerThorsten Behrens <tbehrens@suse.com>2013-08-26 14:47:28 +0200
commit1eecb8df22b77a6982601bf877067a685d913a7d (patch)
tree20c697c765595d555afb84a9bf1f1f95dd17c5c2 /test
parentf78db7cb1c973bd3c8f74fe4a226fb78ad7fbaff (diff)
Some cleanup and consolidation of the Impress layout work.
Also make unit test work again after Mac-app like path changes. Change-Id: I13eae20141650e1d1d826a794d1f19baaef5f561
Diffstat (limited to 'test')
-rw-r--r--test/Package_unittest.mk2
-rw-r--r--test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml9
2 files changed, 8 insertions, 3 deletions
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index 1a83b4c27eb9..6edfc9c6ddf6 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/sta
$(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau))
$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm))
$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml))
-$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml))
$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml))
$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/layoutlist.xml,user/config/soffice.cfg/simpress/layoutlist.xml))
$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetupl.xpm,user/config/psetupl.xpm))
diff --git a/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml b/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml
index d7338ad38ccf..c5f8d5ef3ecf 100644
--- a/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml
+++ b/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml
@@ -1,5 +1,10 @@
<?xml version="1.0"?>
-<!-- At present I am not sure about corect XML namespace,so once I am aware of it.I am ready to add it.
+<!-- Configurable definitions of Impress slide layouts.
+
+ Currently the layout type name needs to match a set of predefined strings.
+ Per entry, you can declare up to one Title object, and up to four
+ Outline objects. All values are relative to Impress' 'layout
+ rect', which is roughly 90% of the available slide area.
-->
<layout-list>
<layout type="AUTOLAYOUT_TITLE_CONTENT">
@@ -78,4 +83,4 @@
<presobj kind="PRESOBJ_OUTLINE1" relative-height="1" relative-width="0.488" relative-posX="0" relative-posY="0"/>
<presobj kind="PRESOBJ_OUTLINE2" relative-height="1" relative-width="0.488" relative-posX="1.05" relative-posY="0"/>
</layout>
-</layout-list> \ No newline at end of file
+</layout-list>